Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a18420c9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix DevicePolicyManager.isBackupServiceEnabled() breakage."

parents 03f23572 630dec9e

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

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,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) {

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+9 −7
Original line number Diff line number Diff line
@@ -13478,6 +13478,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        final CallerIdentity caller = getCallerIdentity(admin);

        Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));













        return mInjector.binderWithCleanCallingIdentity(() -> {















            synchronized (getLockObject()) {















                try {















                    IBackupManager ibm = mInjector.getIBackupManager();









@@ -13486,6 +13487,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                    throw new IllegalStateException("Failed requesting backup service state.", e);















                }















            }













        });















    }





























    @Override