diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-30 18:25:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 18:25:02 -0700 |
| commit | 02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd (patch) | |
| tree | f2bd88e08646217e026f469eec0e90c40a506c37 /services | |
| parent | 91b2eb933cbafbce13e2afa2220cd72d363be947 (diff) | |
| parent | 734d270769c609c7d3a1f2ec46e1d329d9682ab4 (diff) | |
| download | frameworks_base-02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd.zip frameworks_base-02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd.tar.gz frameworks_base-02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd.tar.bz2 | |
am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4'
* commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4':
Renaming SharedPreferences$Editor.startCommit to apply
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/BootReceiver.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java index d15a058..b9ff8d0 100644 --- a/services/java/com/android/server/BootReceiver.java +++ b/services/java/com/android/server/BootReceiver.java @@ -167,7 +167,7 @@ public class BootReceiver extends BroadcastReceiver { if (lastTime == fileTime) return; // Already logged this particular file // TODO: move all these SharedPreferences Editor commits // outside this function to the end of logBootEvents - prefs.edit().putLong(filename, fileTime).startCommit(); + prefs.edit().putLong(filename, fileTime).apply(); } Slog.i(TAG, "Copying " + filename + " to DropBox (" + tag + ")"); |