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

am c19c9e4e: am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread

Browse Source 
Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1'

* commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
This commit is contained in:
Brad Fitzpatrick
2010-09-07 11:18:39 -07:00
committed by Android Git Automerger
parent e2a537f235 c19c9e4ee2
commit cbf16ebdab
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/backup/SharedPreferencesBackupHelper.java
View File

@@ -16,6 +16,7 @@
package android.app.backup;
import android.app.QueuedWork;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.ParcelFileDescriptor;
@@ -94,7 +95,11 @@ public class SharedPreferencesBackupHelper extends FileBackupHelperBase implemen
public void performBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
ParcelFileDescriptor newState) {
Context context = mContext;
// If a SharedPreference has an outstanding write in flight,
// wait for it to finish flushing to disk.
QueuedWork.waitToFinish();
// make filenames for the prefGroups
String[] prefGroups = mPrefGroups;
final int N = prefGroups.length;
@@ -123,4 +128,3 @@ public class SharedPreferencesBackupHelper extends FileBackupHelperBase implemen
}
}
}