Merge "Clear calling uid in isAppEligibleForBackup() and variant" (b56074b3) · Commits · e / os / android_frameworks_base

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

+32 −22

Original line number	Diff line number	Diff line
		@@ -3464,6 +3464,8 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.BACKUP, "isAppEligibleForBackup");

		long oldToken = Binder.clearCallingIdentity();
		try {
		String callerLogString = "BMS.isAppEligibleForBackup";
		TransportClient transportClient =
		mTransportManager.getCurrentTransportClient(callerLogString);
		@@ -3474,6 +3476,9 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter
		mTransportManager.disposeOfTransportClient(transportClient, callerLogString);
		}
		return eligible;
		} finally {
		Binder.restoreCallingIdentity(oldToken);
		}
		}

		@Override
		@@ -3481,6 +3486,8 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.BACKUP, "filterAppsEligibleForBackup");

		long oldToken = Binder.clearCallingIdentity();
		try {
		String callerLogString = "BMS.filterAppsEligibleForBackup";
		TransportClient transportClient =
		mTransportManager.getCurrentTransportClient(callerLogString);
		@@ -3496,6 +3503,9 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter
		mTransportManager.disposeOfTransportClient(transportClient, callerLogString);
		}
		return eligibleApps.toArray(new String[eligibleApps.size()]);
		} finally {
		Binder.restoreCallingIdentity(oldToken);
		}
		}

		@Override