diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index 9ee0159e903a1..1a5d91c8cca5c 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -4369,7 +4369,7 @@ public class UserBackupManagerService { return OperationType.BACKUP; } - long oldCallingId = Binder.clearCallingIdentity(); + final long oldCallingId = Binder.clearCallingIdentity(); try { IBackupTransport transport = transportClient.connectOrThrow( /* caller */ "BMS.getOperationTypeFromTransport"); diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 688452dffee7f..2f5cc755bd650 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -808,7 +808,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind + " for " + association + " - profile still present in " + otherAssociationWithDeviceProfile); } else { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mRoleManager.removeRoleHolderAsUser( association.getDeviceProfile(), @@ -1088,7 +1088,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } private List getAllUsers() { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { return mUserManager.getUsers(); } finally { @@ -1104,7 +1104,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } private Set getAllAssociations() { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { ArraySet result = new ArraySet<>(); for (UserInfo user : mUserManager.getAliveUsers()) { diff --git a/services/core/java/com/android/server/SensorPrivacyService.java b/services/core/java/com/android/server/SensorPrivacyService.java index 71609d2b557dc..c0c347b2ade1d 100644 --- a/services/core/java/com/android/server/SensorPrivacyService.java +++ b/services/core/java/com/android/server/SensorPrivacyService.java @@ -336,7 +336,7 @@ public final class SensorPrivacyService extends SystemService { return; } - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { onSensorUseStarted(uid, packageName, sensor); } finally { @@ -608,7 +608,7 @@ public final class SensorPrivacyService extends SystemService { mIndividualEnabled.put(userId, userIndividualEnabled); if (!enable) { - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { // Remove any notifications prompting the user to disable sensory privacy NotificationManager notificationManager = diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 53778ab41a949..ec2f4aa821e27 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -3462,7 +3462,7 @@ class StorageManagerService extends IStorageManager.Stub // We want to call the manageSpaceActivity as a SystemService and clear identity // of the calling App int originalUid = Binder.getCallingUidOrThrow(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { ApplicationInfo appInfo = mIPackageManager.getApplicationInfo(packageName, 0, diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java index 54abc639ad550..70ad4c1722154 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java @@ -263,7 +263,7 @@ public class FingerprintService extends SystemService { final boolean isKeyguard = Utils.isKeyguard(getContext(), opPackageName); // Clear calling identity when checking LockPatternUtils for StrongAuth flags. - long identity = Binder.clearCallingIdentity(); + final long identity1 = Binder.clearCallingIdentity(); try { if (isKeyguard && Utils.isUserEncryptedOrLockdown(mLockPatternUtils, userId)) { // If this happens, something in KeyguardUpdateMonitor is wrong. @@ -273,7 +273,7 @@ public class FingerprintService extends SystemService { return; } } finally { - Binder.restoreCallingIdentity(identity); + Binder.restoreCallingIdentity(identity1); } final boolean restricted = getContext().checkCallingPermission(MANAGE_FINGERPRINT) @@ -297,11 +297,11 @@ public class FingerprintService extends SystemService { provider.second.getSensorProperties(sensorId); if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName) && sensorProps != null && sensorProps.isAnyUdfpsType()) { - identity = Binder.clearCallingIdentity(); + final long identity2 = Binder.clearCallingIdentity(); try { authenticateWithPrompt(operationId, sensorProps, userId, receiver); } finally { - Binder.restoreCallingIdentity(identity); + Binder.restoreCallingIdentity(identity2); } } else { provider.second.scheduleAuthenticate(provider.first, token, operationId, userId, diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 2ed160a33af4c..9164e7c4e17b6 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -2359,7 +2359,7 @@ public class HdmiControlService extends SystemService { @Override public List getUserCecSettings() { initBinderCall(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { return HdmiControlService.this.getHdmiCecConfig().getUserSettings(); } finally { @@ -2370,7 +2370,7 @@ public class HdmiControlService extends SystemService { @Override public List getAllowedCecSettingStringValues(String name) { initBinderCall(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { return HdmiControlService.this.getHdmiCecConfig().getAllowedStringValues(name); } finally { @@ -2381,7 +2381,7 @@ public class HdmiControlService extends SystemService { @Override public int[] getAllowedCecSettingIntValues(String name) { initBinderCall(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { List allowedValues = HdmiControlService.this.getHdmiCecConfig().getAllowedIntValues(name); @@ -2394,7 +2394,7 @@ public class HdmiControlService extends SystemService { @Override public String getCecSettingStringValue(String name) { initBinderCall(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { return HdmiControlService.this.getHdmiCecConfig().getStringValue(name); } finally { @@ -2405,7 +2405,7 @@ public class HdmiControlService extends SystemService { @Override public void setCecSettingStringValue(String name, String value) { initBinderCall(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { HdmiControlService.this.getHdmiCecConfig().setStringValue(name, value); } finally { @@ -2416,7 +2416,7 @@ public class HdmiControlService extends SystemService { @Override public int getCecSettingIntValue(String name) { initBinderCall(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { return HdmiControlService.this.getHdmiCecConfig().getIntValue(name); } finally { @@ -2427,7 +2427,7 @@ public class HdmiControlService extends SystemService { @Override public void setCecSettingIntValue(String name, int value) { initBinderCall(); - long token = Binder.clearCallingIdentity(); + final long token = Binder.clearCallingIdentity(); try { HdmiControlService.this.getHdmiCecConfig().setIntValue(name, value); } finally { diff --git a/services/core/java/com/android/server/location/gnss/GnssAntennaInfoProvider.java b/services/core/java/com/android/server/location/gnss/GnssAntennaInfoProvider.java index 1967e026e46c0..e3750074168c2 100644 --- a/services/core/java/com/android/server/location/gnss/GnssAntennaInfoProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssAntennaInfoProvider.java @@ -82,7 +82,7 @@ public class GnssAntennaInfoProvider extends } public void addListener(CallerIdentity callerIdentity, IGnssAntennaInfoListener listener) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { putRegistration(listener.asBinder(), new AntennaInfoListenerRegistration(callerIdentity, listener)); @@ -92,7 +92,7 @@ public class GnssAntennaInfoProvider extends } public void removeListener(IGnssAntennaInfoListener listener) { - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { removeRegistration(listener.asBinder()); } finally { diff --git a/services/core/java/com/android/server/location/gnss/GnssManagerService.java b/services/core/java/com/android/server/location/gnss/GnssManagerService.java index 21946ca88401e..5de9cf3f5b6af 100644 --- a/services/core/java/com/android/server/location/gnss/GnssManagerService.java +++ b/services/core/java/com/android/server/location/gnss/GnssManagerService.java @@ -331,7 +331,7 @@ public class GnssManagerService { @Override public void onCapabilitiesChanged(GnssCapabilities oldCapabilities, GnssCapabilities newCapabilities) { - long ident = Binder.clearCallingIdentity(); + final long ident = Binder.clearCallingIdentity(); try { Intent intent = new Intent(LocationManager.ACTION_GNSS_CAPABILITIES_CHANGED) .putExtra(LocationManager.EXTRA_GNSS_CAPABILITIES, newCapabilities) diff --git a/services/core/java/com/android/server/location/injector/SystemDeviceStationaryHelper.java b/services/core/java/com/android/server/location/injector/SystemDeviceStationaryHelper.java index 9874ecfdefdf7..7369eac48c056 100644 --- a/services/core/java/com/android/server/location/injector/SystemDeviceStationaryHelper.java +++ b/services/core/java/com/android/server/location/injector/SystemDeviceStationaryHelper.java @@ -41,7 +41,7 @@ public class SystemDeviceStationaryHelper extends DeviceStationaryHelper { public void addListener(DeviceIdleInternal.StationaryListener listener) { Preconditions.checkState(mDeviceIdle != null); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mDeviceIdle.registerStationaryListener(listener); } finally { @@ -53,7 +53,7 @@ public class SystemDeviceStationaryHelper extends DeviceStationaryHelper { public void removeListener(DeviceIdleInternal.StationaryListener listener) { Preconditions.checkState(mDeviceIdle != null); - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { mDeviceIdle.unregisterStationaryListener(listener); } finally { diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 5b03989f52488..8cb125d64ad77 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1620,7 +1620,7 @@ public class LockSettingsService extends ILockSettings.Stub { + PERMISSION); } - long identity = Binder.clearCallingIdentity(); + final long identity = Binder.clearCallingIdentity(); try { enforceFrpResolved(); // When changing credential for profiles with unified challenge, some callers