Merge RP1A.200221.003

Conflicts:
	api/system-current.txt
	core/jni/AndroidRuntime.cpp
	core/res/res/values/symbols.xml
	packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
	services/core/java/com/android/server/ConnectivityService.java
	services/core/java/com/android/server/am/ActivityManagerConstants.java
	services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
	services/core/java/com/android/server/display/LocalDisplayAdapter.java
	telecomm/java/android/telecom/Call.java
	telecomm/java/android/telecom/Connection.java
	telecomm/java/android/telecom/ConnectionService.java
	wifi/java/android/net/wifi/SoftApConfiguration.java

Change-Id: I2405f392c9e65b868e5901dedaa3ce6c90609cd8

1 files changed, 8 insertions, 0 deletions

diff --git a/telephony/java/android/service/carrier/CarrierService.java b/telephony/java/android/service/carrier/CarrierService.java
index eefc1b70bac9..d06ec11f3e61 100644
--- a/telephony/java/android/service/carrier/CarrierService.java
+++ b/telephony/java/android/service/carrier/CarrierService.java
@@ -25,6 +25,9 @@ import android.os.ResultReceiver;
 import android.telephony.TelephonyRegistryManager;
 import android.util.Log;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+
 /**
  * A service that exposes carrier-specific functionality to the system.
  * <p>
@@ -156,5 +159,10 @@ public abstract class CarrierService extends Service {
                 result.send(RESULT_ERROR, null);
             }
         }
+
+        @Override
+        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+            CarrierService.this.dump(fd, pw, args);
+        }
     }
 }