diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:09:55 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:43 -0700 |
| commit | cacdaa4aeedc6b0817eba92a83b8e5edfe27f637 (patch) | |
| tree | f12313a55eeaa75f4faff3e1d134dc349420f094 /services/backup | |
| parent | 1ab48a3666118e40cf56142c886a7217b92d0d4a (diff) | |
| parent | 4e4743a354e26467318b437892a9980eb9b8328a (diff) | |
| download | frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.zip frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.gz frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.bz2 | |
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: Ib003ccb606e0d77209291b757ea36399d3b65814
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 3e57d31..d16c78a 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 { synchronized(mAgentConnectLock) { mConnecting = true; mConnectedAgent = null; - 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 |