summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-30 18:18:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-30 18:18:54 -0700
commit734d270769c609c7d3a1f2ec46e1d329d9682ab4 (patch)
treea6c455a9a3b31eb0ecdbc591b2750f4d29ff5b20 /services
parent03e83d4ad909f5c07fb2011e03348a413453e909 (diff)
parentbb660d7e1bed3a07a1804bd9641d9634bfaa4972 (diff)
downloadframeworks_base-734d270769c609c7d3a1f2ec46e1d329d9682ab4.zip
frameworks_base-734d270769c609c7d3a1f2ec46e1d329d9682ab4.tar.gz
frameworks_base-734d270769c609c7d3a1f2ec46e1d329d9682ab4.tar.bz2
am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp * commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972': Renaming SharedPreferences$Editor.startCommit to apply
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/BootReceiver.java2
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 + ")");