summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-30 18:14:44 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-30 18:14:44 -0700
commitbb660d7e1bed3a07a1804bd9641d9634bfaa4972 (patch)
treeeef3b87c7b7cd92b62c1fe272e49d5cd1dce8777 /services
parent68ae91cbd20939e48ad15c15405048e7ff9fe2f8 (diff)
parent66fce5068a8a3aeb28aaf713843891b286a75280 (diff)
downloadframeworks_base-bb660d7e1bed3a07a1804bd9641d9634bfaa4972.zip
frameworks_base-bb660d7e1bed3a07a1804bd9641d9634bfaa4972.tar.gz
frameworks_base-bb660d7e1bed3a07a1804bd9641d9634bfaa4972.tar.bz2
Merge "Renaming SharedPreferences$Editor.startCommit to apply" into gingerbread
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 + ")");