Merge "Final token from Binder.clearCallingIdentity()" (560471ce) · Commits · e / os / android_frameworks_base

services/backup/java/com/android/server/backup/UserBackupManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");

+3 −3

Original line number	Diff line number	Diff line
		@@ -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<UserInfo> 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<Association> getAllAssociations() {
		long identity = Binder.clearCallingIdentity();
		final long identity = Binder.clearCallingIdentity();
		try {
		ArraySet<Association> result = new ArraySet<>();
		for (UserInfo user : mUserManager.getAliveUsers()) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 =

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

+4 −4

Original line number	Diff line number	Diff line
		@@ -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,