Merge "SDK API doesSwitchModemConfigTriggerReboot"
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 69aea4d..ca93961 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6894,12 +6894,15 @@
}
/**
- * Get whether reboot is required or not after making changes to modem configurations.
- * Return value defaults to true
+ * Get whether making changes to modem configurations will trigger reboot.
+ * Return value defaults to true.
*/
@Override
- public boolean isRebootRequiredForModemConfigChange() {
- enforceReadPrivilegedPermission("isRebootRequiredForModemConfigChange");
+ public boolean doesSwitchMultiSimConfigTriggerReboot(int subId, String callingPackage) {
+ if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+ mApp, subId, callingPackage, "doesSwitchMultiSimConfigTriggerReboot")) {
+ return false;
+ }
final long identity = Binder.clearCallingIdentity();
try {
return mPhoneConfigurationManager.isRebootRequiredForModemConfigChange();