Merge "Fix DevicePolicyManager.isBackupServiceEnabled() breakage." into rvc-qpr-dev-plus-aosp (413001ee) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ public class BackupManagerService extends IBackupManager.Stub {
		int callingUid = Binder.getCallingUid();
		if (CompatChanges.isChangeEnabled(
		BackupManager.IS_BACKUP_SERVICE_ACTIVE_ENFORCE_PERMISSION_IN_SERVICE, callingUid)) {
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP,
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,
		"isBackupServiceActive");
		}
		synchronized (mStateLock) {

+10 −8

Original line number	Diff line number	Diff line
		@@ -14454,15 +14454,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		enforceProfileOrDeviceOwner(admin);
		final int userId = mInjector.userHandleGetCallingUserId();
		return mInjector.binderWithCleanCallingIdentity(() -> {
		synchronized (getLockObject()) {
		try {
		IBackupManager ibm = mInjector.getIBackupManager();
		return ibm != null && ibm.isBackupServiceActive(
		mInjector.userHandleGetCallingUserId());
		return ibm != null && ibm.isBackupServiceActive(userId);
		} catch (RemoteException e) {
		throw new IllegalStateException("Failed requesting backup service state.", e);
		}
		}
		});
		}

		@Override