Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '660af7eb1a55e2df7da45aa63ca227141ef86b34':
  Change permission guard on bindBackupAgent()
This commit is contained in:
Jeff Vander Stoep
2014-09-11 18:58:49 +00:00
committed by Android Git Automerger
parent e1f07060b8 660af7eb1a
commit 1c2eaa784b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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