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

Commit 1c2eaa78 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by Android Git Automerger
Browse files

am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 

* commit '660af7eb':
  Change permission guard on bindBackupAgent()
parents e1f07060 660af7eb

services/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -11409,7 +11409,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    // activity manager to announce its creation.

    public boolean bindBackupAgent(ApplicationInfo app, int backupMode) {

        if (DEBUG_BACKUP) Slog.v(TAG, "bindBackupAgent: app=" + app + " mode=" + backupMode);

        enforceCallingPermission("android.permission.BACKUP", "bindBackupAgent");

        enforceCallingPermission("android.permission.CONFIRM_FULL_BACKUP", "bindBackupAgent");















        synchronized(this) {















            // !!! TODO: currently no check here that we're already bound