Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c19c9e4e authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async... 

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

Merge commit 'b1104b37' into gingerbread-plus-aosp

* commit 'b1104b37':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
parents aab73757 b1104b37

core/java/android/app/backup/SharedPreferencesBackupHelper.java

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.app.backup;



import android.app.QueuedWork;

import android.content.Context;

import android.content.SharedPreferences;

import android.os.ParcelFileDescriptor;
@@ -95,6 +96,10 @@ public class SharedPreferencesBackupHelper extends FileBackupHelperBase implemen 
            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 
        }

    }

}