Merge "Change USCC EriText for roaming indicator 1 with U.S. Cellular" into pi-dev
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a327d88..393168b 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4058,6 +4058,26 @@
}
/**
+ * Action set from carrier signalling broadcast receivers to reset all carrier actions
+ * @param subId the subscription ID that this action applies to.
+ * {@hide}
+ */
+ @Override
+ public void carrierActionResetAll(int subId) {
+ enforceModifyPermission();
+ final Phone phone = getPhone(subId);
+ if (phone == null) {
+ loge("carrierAction: ResetAll fails with invalid sibId: " + subId);
+ return;
+ }
+ try {
+ phone.carrierActionResetAll();
+ } catch (Exception e) {
+ Log.e(LOG_TAG, "carrierAction: ResetAll fails. Exception ex=" + e);
+ }
+ }
+
+ /**
* Called when "adb shell dumpsys phone" is invoked. Dump is also automatically invoked when a
* bug report is being generated.
*/