Merge "Add logic to update the notification whenever the satellite availaibility changes." into main
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index bb39302..b0f88b2 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8595,9 +8595,10 @@
setNetworkSelectionModeAutomatic(subId);
Phone phone = getPhone(subId);
cleanUpAllowedNetworkTypes(phone, subId);
+
setDataRoamingEnabled(subId, phone == null ? false
: phone.getDataSettingsManager().isDefaultDataRoamingEnabled());
- getPhone(subId).resetCarrierKeysForImsiEncryption();
+ getPhone(subId).resetCarrierKeysForImsiEncryption(true);
}
// There has been issues when Sms raw table somehow stores orphan
// fragments. They lead to garbled message when new fragments come
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 5ea1304..93ac55e 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -232,6 +232,7 @@
"set-allowed-network-types-for-users";
private static final String GET_IMEI = "get-imei";
private static final String GET_SIM_SLOTS_MAPPING = "get-sim-slots-mapping";
+ private static final String COMMAND_DELETE_IMSI_KEY = "delete_imsi_key";
// Take advantage of existing methods that already contain permissions checks when possible.
private final ITelephony mInterface;
@@ -431,6 +432,8 @@
return handleSetSatelliteSubscriberIdListChangedIntentComponent();
case SET_SATELLITE_ACCESS_RESTRICTION_CHECKING_RESULT:
return handleOverrideCarrierRoamingNtnEligibilityChanged();
+ case COMMAND_DELETE_IMSI_KEY:
+ return handleDeleteTestImsiKey();
default: {
return handleDefaultCommands(cmd);
}
@@ -4132,4 +4135,22 @@
Log.d(LOG_TAG, "handleSetSatelliteAccessRestrictionCheckingResult(" + state + ")");
return 0;
}
+
+ private int handleDeleteTestImsiKey() {
+ if (!(checkShellUid())) {
+ Log.v(LOG_TAG,
+ "handleCarrierRestrictionStatusCommand, MockModem service check fails or "
+ + " checkShellUid fails");
+ return -1;
+ }
+
+ Phone phone = PhoneFactory.getDefaultPhone();
+ if (phone == null) {
+ Log.e(LOG_TAG,
+ "handleCarrierRestrictionStatusCommand" + "No default Phone available");
+ return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+ phone.resetCarrierKeysForImsiEncryption(true);
+ return 1;
+ }
}