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

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

Browse Source 
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
This commit is contained in:
Brad Fitzpatrick
2010-09-07 11:15:01 -07:00
committed by Android Git Automerger
parent aab7375799 b1104b3713
commit c19c9e4ee2
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; package android.app.backup;
import android.app.QueuedWork;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
@@ -94,7 +95,11 @@ public class SharedPreferencesBackupHelper extends FileBackupHelperBase implemen
public void performBackup(ParcelFileDescriptor oldState, BackupDataOutput data, public void performBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
ParcelFileDescriptor newState) { ParcelFileDescriptor newState) {
Context context = mContext; 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 // make filenames for the prefGroups
String[] prefGroups = mPrefGroups; String[] prefGroups = mPrefGroups;
final int N = prefGroups.length; final int N = prefGroups.length;
@@ -123,4 +128,3 @@ public class SharedPreferencesBackupHelper extends FileBackupHelperBase implemen
} }
} }
} }