diff options
| author | Christopher Tate <ctate@google.com> | 2011-04-04 17:41:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-04 17:41:22 -0700 |
| commit | 42bc0e946f8b986fb3aaada9980b496172e2b511 (patch) | |
| tree | 1b680f23224d902d462837f6af2c73fd149d81a5 /services | |
| parent | cace13d72a71cd8802b5804c47f5b5a9a7c01a74 (diff) | |
| parent | 4559764e9f8adadcc80c825fb5dafd3dfb739bcf (diff) | |
| download | frameworks_base-42bc0e946f8b986fb3aaada9980b496172e2b511.zip frameworks_base-42bc0e946f8b986fb3aaada9980b496172e2b511.tar.gz frameworks_base-42bc0e946f8b986fb3aaada9980b496172e2b511.tar.bz2 | |
Merge "Fix deadlock in BackupManagerService"
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index ea38fbb..6e76331 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -760,15 +760,15 @@ class BackupManagerService extends IBackupManager.Stub { sf.delete(); } } + } - // Enqueue a new backup of every participant - int N = mBackupParticipants.size(); - for (int i=0; i<N; i++) { - int uid = mBackupParticipants.keyAt(i); - HashSet<ApplicationInfo> participants = mBackupParticipants.valueAt(i); - for (ApplicationInfo app: participants) { - dataChangedImpl(app.packageName); - } + // Enqueue a new backup of every participant + int N = mBackupParticipants.size(); + for (int i=0; i<N; i++) { + int uid = mBackupParticipants.keyAt(i); + HashSet<ApplicationInfo> participants = mBackupParticipants.valueAt(i); + for (ApplicationInfo app: participants) { + dataChangedImpl(app.packageName); } } } |