diff options
| author | 2014-09-23 17:11:58 +0000 | |
|---|---|---|
| committer | 2014-09-23 17:11:58 +0000 | |
| commit | 1cf337a222bbb0e26445e7904ece687af93aac48 (patch) | |
| tree | 2126d6a59fa7764932781638a570d76b9f148757 | |
| parent | 4d0f84bb55957c0f5372b53fe94ddfb53c9d0cf8 (diff) | |
| parent | 52824dab7ba48713411ff3a26580b29aa2088242 (diff) | |
am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '52824dab7ba48713411ff3a26580b29aa2088242':
Change permission guard on bindBackupAgent()
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index a6deed54eab3..74f3bebf88c3 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -12674,7 +12674,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 |