ClearCallingIdentity for all satellite APIs in PhoneInterfacemanager
Bug: 375208062
Test: atest SatelliteControllerTest
Test: atest SatelliteManagerTestOnMockService
Test: manual test - demo/real mode
Flag: EXEMPT bug fix
Change-Id: Idf9ffe43954a936b85448fe43727f53e93431889
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index bc560d9..d7f7939 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -13200,40 +13200,48 @@
public void requestSatelliteEnabled(boolean enableSatellite, boolean enableDemoMode,
boolean isEmergency, @NonNull IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("requestSatelliteEnabled");
- if (enableSatellite) {
- ResultReceiver resultReceiver = new ResultReceiver(mMainThreadHandler) {
- @Override
- protected void onReceiveResult(int resultCode, Bundle resultData) {
- Log.d(LOG_TAG, "Satellite access restriction resultCode=" + resultCode
- + ", resultData=" + resultData);
- boolean isAllowed = false;
- Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(
- callback::accept);
- if (resultCode == SATELLITE_RESULT_SUCCESS) {
- if (resultData != null
- && resultData.containsKey(KEY_SATELLITE_COMMUNICATION_ALLOWED)) {
- isAllowed = resultData.getBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ if (enableSatellite) {
+ ResultReceiver resultReceiver = new ResultReceiver(mMainThreadHandler) {
+ @Override
+ protected void onReceiveResult(int resultCode, Bundle resultData) {
+ Log.d(LOG_TAG, "Satellite access restriction resultCode=" + resultCode
+ + ", resultData=" + resultData);
+ boolean isAllowed = false;
+ Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(
+ callback::accept);
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
+ if (resultData != null
+ && resultData.containsKey(
+ KEY_SATELLITE_COMMUNICATION_ALLOWED)) {
+ isAllowed = resultData.getBoolean(
+ KEY_SATELLITE_COMMUNICATION_ALLOWED);
+ } else {
+ loge("KEY_SATELLITE_COMMUNICATION_ALLOWED does not exist.");
+ }
} else {
- loge("KEY_SATELLITE_COMMUNICATION_ALLOWED does not exist.");
+ result.accept(resultCode);
+ return;
}
- } else {
- result.accept(resultCode);
- return;
+ if (isAllowed) {
+ mSatelliteController.requestSatelliteEnabled(
+ enableSatellite, enableDemoMode, isEmergency, callback);
+ } else {
+ result.accept(SATELLITE_RESULT_ACCESS_BARRED);
+ }
}
- if (isAllowed) {
- mSatelliteController.requestSatelliteEnabled(
- enableSatellite, enableDemoMode, isEmergency, callback);
- } else {
- result.accept(SATELLITE_RESULT_ACCESS_BARRED);
- }
- }
- };
- mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(
- resultReceiver, true);
- } else {
- // No need to check if satellite is allowed at current location when disabling satellite
- mSatelliteController.requestSatelliteEnabled(
- enableSatellite, enableDemoMode, isEmergency, callback);
+ };
+ mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(
+ resultReceiver, true);
+ } else {
+ // No need to check if satellite is allowed at current location when disabling
+ // satellite
+ mSatelliteController.requestSatelliteEnabled(
+ enableSatellite, enableDemoMode, isEmergency, callback);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
}
}
@@ -13248,7 +13256,12 @@
@Override
public void requestIsSatelliteEnabled(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsSatelliteEnabled");
- mSatelliteController.requestIsSatelliteEnabled(result);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestIsSatelliteEnabled(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13262,7 +13275,12 @@
@Override
public void requestIsDemoModeEnabled(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsDemoModeEnabled");
- mSatelliteController.requestIsDemoModeEnabled(result);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestIsDemoModeEnabled(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13276,7 +13294,12 @@
@Override
public void requestIsEmergencyModeEnabled(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsEmergencyModeEnabled");
- mSatelliteController.requestIsEmergencyModeEnabled(result);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestIsEmergencyModeEnabled(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13284,10 +13307,18 @@
*
* @param result The result receiver that returns whether the satellite service is supported on
* the device if the request is successful or an error code if the request failed.
+ *
+ * @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
public void requestIsSatelliteSupported(@NonNull ResultReceiver result) {
- mSatelliteController.requestIsSatelliteSupported(result);
+ enforceSatelliteCommunicationPermission("requestIsSatelliteSupported");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestIsSatelliteSupported(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13301,7 +13332,12 @@
@Override
public void requestSatelliteCapabilities(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestSatelliteCapabilities");
- mSatelliteController.requestSatelliteCapabilities(result);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestSatelliteCapabilities(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13319,7 +13355,12 @@
@NonNull IIntegerConsumer resultCallback,
@NonNull ISatelliteTransmissionUpdateCallback callback) {
enforceSatelliteCommunicationPermission("startSatelliteTransmissionUpdates");
- mSatelliteController.startSatelliteTransmissionUpdates(resultCallback, callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.startSatelliteTransmissionUpdates(resultCallback, callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13337,7 +13378,12 @@
@NonNull IIntegerConsumer resultCallback,
@NonNull ISatelliteTransmissionUpdateCallback callback) {
enforceSatelliteCommunicationPermission("stopSatelliteTransmissionUpdates");
- mSatelliteController.stopSatelliteTransmissionUpdates(resultCallback, callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.stopSatelliteTransmissionUpdates(resultCallback, callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13404,7 +13450,12 @@
@SatelliteManager.SatelliteResult public int registerForSatelliteProvisionStateChanged(
@NonNull ISatelliteProvisionStateCallback callback) {
enforceSatelliteCommunicationPermission("registerForSatelliteProvisionStateChanged");
- return mSatelliteController.registerForSatelliteProvisionStateChanged(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.registerForSatelliteProvisionStateChanged(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13420,7 +13471,12 @@
public void unregisterForSatelliteProvisionStateChanged(
@NonNull ISatelliteProvisionStateCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForSatelliteProvisionStateChanged");
- mSatelliteController.unregisterForSatelliteProvisionStateChanged(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.unregisterForSatelliteProvisionStateChanged(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13435,7 +13491,12 @@
@Override
public void requestIsSatelliteProvisioned(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsSatelliteProvisioned");
- mSatelliteController.requestIsSatelliteProvisioned(result);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestIsSatelliteProvisioned(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13451,7 +13512,12 @@
@SatelliteManager.SatelliteResult public int registerForSatelliteModemStateChanged(
@NonNull ISatelliteModemStateCallback callback) {
enforceSatelliteCommunicationPermission("registerForSatelliteModemStateChanged");
- return mSatelliteController.registerForSatelliteModemStateChanged(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.registerForSatelliteModemStateChanged(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13466,7 +13532,12 @@
@Override
public void unregisterForModemStateChanged(@NonNull ISatelliteModemStateCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForModemStateChanged");
- mSatelliteController.unregisterForModemStateChanged(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.unregisterForModemStateChanged(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13482,7 +13553,12 @@
@SatelliteManager.SatelliteResult public int registerForIncomingDatagram(
@NonNull ISatelliteDatagramCallback callback) {
enforceSatelliteCommunicationPermission("registerForIncomingDatagram");
- return mSatelliteController.registerForIncomingDatagram(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.registerForIncomingDatagram(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13497,7 +13573,12 @@
@Override
public void unregisterForIncomingDatagram(@NonNull ISatelliteDatagramCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForIncomingDatagram");
- mSatelliteController.unregisterForIncomingDatagram(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.unregisterForIncomingDatagram(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13513,7 +13594,12 @@
*/
public void pollPendingDatagrams(IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("pollPendingDatagrams");
- mSatelliteController.pollPendingDatagrams(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.pollPendingDatagrams(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13538,8 +13624,13 @@
@NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,
@NonNull IIntegerConsumer callback) {
enforceSatelliteCommunicationPermission("sendDatagram");
- mSatelliteController.sendDatagram(datagramType, datagram, needFullScreenPointingUI,
- callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.sendDatagram(datagramType, datagram, needFullScreenPointingUI,
+ callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13557,7 +13648,13 @@
public void requestIsCommunicationAllowedForCurrentLocation(int subId,
@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestIsCommunicationAllowedForCurrentLocation");
- mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(result, false);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(result,
+ false);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13571,7 +13668,12 @@
@Override
public void requestTimeForNextSatelliteVisibility(@NonNull ResultReceiver result) {
enforceSatelliteCommunicationPermission("requestTimeForNextSatelliteVisibility");
- mSatelliteController.requestTimeForNextSatelliteVisibility(result);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.requestTimeForNextSatelliteVisibility(result);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13585,8 +13687,13 @@
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
public void setDeviceAlignedWithSatellite(@NonNull boolean isAligned) {
- enforceSatelliteCommunicationPermission("informDeviceAlignedToSatellite");
- mSatelliteController.setDeviceAlignedWithSatellite(isAligned);
+ enforceSatelliteCommunicationPermission("setDeviceAlignedWithSatellite");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.setDeviceAlignedWithSatellite(isAligned);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13780,7 +13887,12 @@
@SatelliteManager.SatelliteResult public int registerForSatelliteSupportedStateChanged(
@NonNull ISatelliteSupportedStateCallback callback) {
enforceSatelliteCommunicationPermission("registerForSatelliteSupportedStateChanged");
- return mSatelliteController.registerForSatelliteSupportedStateChanged(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.registerForSatelliteSupportedStateChanged(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13796,7 +13908,12 @@
public void unregisterForSatelliteSupportedStateChanged(
@NonNull ISatelliteSupportedStateCallback callback) {
enforceSatelliteCommunicationPermission("unregisterForSatelliteSupportedStateChanged");
- mSatelliteController.unregisterForSatelliteSupportedStateChanged(callback);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mSatelliteController.unregisterForSatelliteSupportedStateChanged(callback);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13817,8 +13934,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setSatelliteServicePackageName");
- return mSatelliteController.setSatelliteServicePackageName(servicePackageName,
- provisioned);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setSatelliteServicePackageName(servicePackageName,
+ provisioned);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13835,7 +13957,12 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setSatelliteGatewayServicePackageName");
- return mSatelliteController.setSatelliteGatewayServicePackageName(servicePackageName);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setSatelliteGatewayServicePackageName(servicePackageName);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13854,8 +13981,13 @@
Binder.getCallingUid(), "setSatellitePointingUiClassName");
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
- "setSatelliteGatewayServicePackageName");
- return mSatelliteController.setSatellitePointingUiClassName(packageName, className);
+ "setSatellitePointingUiClassName");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setSatellitePointingUiClassName(packageName, className);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13873,7 +14005,12 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setSatelliteListeningTimeoutDuration");
- return mSatelliteController.setSatelliteListeningTimeoutDuration(timeoutMillis);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setSatelliteListeningTimeoutDuration(timeoutMillis);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13883,13 +14020,18 @@
* @return {@code true} if the value is set successfully, {@code false} otherwise.
*/
public boolean setSatelliteIgnoreCellularServiceState(boolean enabled) {
- Log.d(LOG_TAG, "setSatelliteIgnoreServiceState - " + enabled);
+ Log.d(LOG_TAG, "setSatelliteIgnoreCellularServiceState - " + enabled);
TelephonyPermissions.enforceShellOnly(
- Binder.getCallingUid(), "setSatelliteIgnoreServiceState");
+ Binder.getCallingUid(), "setSatelliteIgnoreCellularServiceState");
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
- "setSatelliteIgnoreServiceState");
- return mSatelliteController.setSatelliteIgnoreCellularServiceState(enabled);
+ "setSatelliteIgnoreCellularServiceState");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setSatelliteIgnoreCellularServiceState(enabled);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13908,8 +14050,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setDatagramControllerTimeoutDuration");
- return mSatelliteController.setDatagramControllerTimeoutDuration(
- reset, timeoutType, timeoutMillis);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setDatagramControllerTimeoutDuration(
+ reset, timeoutType, timeoutMillis);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13928,7 +14075,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"ssetDatagramControllerBooleanConfig");
- return mSatelliteController.setDatagramControllerBooleanConfig(reset, booleanType, enable);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setDatagramControllerBooleanConfig(reset, booleanType,
+ enable);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
@@ -13948,8 +14101,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setSatelliteControllerTimeoutDuration");
- return mSatelliteController.setSatelliteControllerTimeoutDuration(
- reset, timeoutType, timeoutMillis);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setSatelliteControllerTimeoutDuration(
+ reset, timeoutType, timeoutMillis);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13972,8 +14130,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setEmergencyCallToSatelliteHandoverType");
- return mSatelliteController.setEmergencyCallToSatelliteHandoverType(
- handoverType, delaySeconds);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setEmergencyCallToSatelliteHandoverType(
+ handoverType, delaySeconds);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -13992,7 +14155,12 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setOemEnabledSatelliteProvisionStatus");
- return mSatelliteController.setOemEnabledSatelliteProvisionStatus(reset, isProvisioned);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setOemEnabledSatelliteProvisionStatus(reset, isProvisioned);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -14009,14 +14177,18 @@
+ ", locationCountryCodeTimestampNanos" + locationCountryCodeTimestampNanos
+ ", reset=" + reset + ", cachedNetworkCountryCodes="
+ String.join(", ", cachedNetworkCountryCodes.keySet()));
- TelephonyPermissions.enforceShellOnly(
- Binder.getCallingUid(), "setCachedLocationCountryCode");
+ TelephonyPermissions.enforceShellOnly(Binder.getCallingUid(), "setCountryCodes");
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
- SubscriptionManager.INVALID_SUBSCRIPTION_ID,
- "setCachedLocationCountryCode");
- return TelephonyCountryDetector.getInstance(getDefaultPhone().getContext(), mFeatureFlags)
- .setCountryCodes(reset, currentNetworkCountryCodes, cachedNetworkCountryCodes,
- locationCountryCode, locationCountryCodeTimestampNanos);
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID, "setCountryCodes");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return TelephonyCountryDetector.getInstance(getDefaultPhone().getContext(),
+ mFeatureFlags).setCountryCodes(reset, currentNetworkCountryCodes,
+ cachedNetworkCountryCodes, locationCountryCode,
+ locationCountryCodeTimestampNanos);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -14040,8 +14212,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setSatelliteAccessControlOverlayConfigs");
- return mSatelliteAccessController.setSatelliteAccessControlOverlayConfigs(reset, isAllowed,
- s2CellFile, locationFreshDurationNanos, satelliteCountryCodes);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteAccessController.setSatelliteAccessControlOverlayConfigs(reset,
+ isAllowed, s2CellFile, locationFreshDurationNanos, satelliteCountryCodes);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -14066,8 +14243,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setShouldSendDatagramToModemInDemoMode");
- return mSatelliteController.setShouldSendDatagramToModemInDemoMode(
- shouldSendToModemInDemoMode);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteController.setShouldSendDatagramToModemInDemoMode(
+ shouldSendToModemInDemoMode);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -14092,8 +14274,13 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
SubscriptionManager.INVALID_SUBSCRIPTION_ID,
"setIsSatelliteCommunicationAllowedForCurrentLocationCache");
- return mSatelliteAccessController.setIsSatelliteCommunicationAllowedForCurrentLocationCache(
- state);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteAccessController
+ .setIsSatelliteCommunicationAllowedForCurrentLocationCache(state);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
/**
@@ -14542,7 +14729,12 @@
*/
public boolean overrideCarrierRoamingNtnEligibilityChanged(boolean state,
boolean resetRequired) {
- return mSatelliteAccessController.overrideCarrierRoamingNtnEligibilityChanged(state,
- resetRequired);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mSatelliteAccessController.overrideCarrierRoamingNtnEligibilityChanged(state,
+ resetRequired);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
}