diff options
| author | Christopher Tate <ctate@google.com> | 2016-06-13 15:17:54 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2016-06-24 16:52:27 -0700 |
| commit | e7cf91a198de995c7440b3b64352effd2e309906 (patch) | |
| tree | f6c9eec88214774ba2314a789d251c5348d41caa /services/backup | |
| parent | 9b8c6d2df35455ce9e67907edded1e4a2ecb9e28 (diff) | |
| download | frameworks_base-e7cf91a198de995c7440b3b64352effd2e309906.zip frameworks_base-e7cf91a198de995c7440b3b64352effd2e309906.tar.gz frameworks_base-e7cf91a198de995c7440b3b64352effd2e309906.tar.bz2 | |
Don't trust callers to supply app info to bindBackupAgent()
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug 28795098
Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877
Merge conflict resolution for ag/1133474 (referencing ag/1148862)
- directly to mnc-mr2-release
Diffstat (limited to 'services/backup')
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 30d90af..ac7c5ab 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -2235,7 +2235,8 @@ public class BackupManagerService { mConnecting = true; mConnectedAgent = null; try { - if (mActivityManager.bindBackupAgent(app, mode)) { + if (mActivityManager.bindBackupAgent(app.packageName, mode, + UserHandle.USER_OWNER)) { Slog.d(TAG, "awaiting agent for " + app); // success; wait for the agent to arrive |