diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 16:11:27 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 16:11:27 -0700 |
| commit | 7f7ce40f90cf00dc046fb9520d77d29e96b474d6 (patch) | |
| tree | a1417c53bcb4e35f1aa261686aa7b789ca8314c5 /services | |
| parent | 6ff0dc0ad9a93a96262da3c0e40483137568de43 (diff) | |
| parent | 28130baefb4fa6d1e0ff9c92337295ba74461cf7 (diff) | |
| download | frameworks_base-7f7ce40f90cf00dc046fb9520d77d29e96b474d6.zip frameworks_base-7f7ce40f90cf00dc046fb9520d77d29e96b474d6.tar.gz frameworks_base-7f7ce40f90cf00dc046fb9520d77d29e96b474d6.tar.bz2 | |
resolved conflicts for merge of 28130bae to master
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/BootReceiver.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/BootReceiver.java b/services/java/com/android/server/BootReceiver.java index f409751..d15a058 100644 --- a/services/java/com/android/server/BootReceiver.java +++ b/services/java/com/android/server/BootReceiver.java @@ -165,7 +165,9 @@ public class BootReceiver extends BroadcastReceiver { if (prefs != null) { long lastTime = prefs.getLong(filename, 0); if (lastTime == fileTime) return; // Already logged this particular file - prefs.edit().putLong(filename, fileTime).commit(); + // TODO: move all these SharedPreferences Editor commits + // outside this function to the end of logBootEvents + prefs.edit().putLong(filename, fileTime).startCommit(); } Slog.i(TAG, "Copying " + filename + " to DropBox (" + tag + ")"); |