diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 12:08:40 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 12:08:40 -0700 |
| commit | 28130baefb4fa6d1e0ff9c92337295ba74461cf7 (patch) | |
| tree | 21c870a702d64402a8fa503353b82ae21bb50bee /core/java/android/server | |
| parent | dfad42760f3c9c3b8439ff4b365256474471abe4 (diff) | |
| parent | 6b50986a6b64fa3cbe4d527137134cd14d0ad6bd (diff) | |
| download | frameworks_base-28130baefb4fa6d1e0ff9c92337295ba74461cf7.zip frameworks_base-28130baefb4fa6d1e0ff9c92337295ba74461cf7.tar.gz frameworks_base-28130baefb4fa6d1e0ff9c92337295ba74461cf7.tar.bz2 | |
resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
Diffstat (limited to 'core/java/android/server')
| -rw-r--r-- | core/java/android/server/BluetoothService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index f00389b..abd66ae 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -1737,7 +1737,7 @@ public class BluetoothService extends IBluetooth.Stub { mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, mContext.MODE_PRIVATE).edit(); editor.putBoolean(SHARED_PREFERENCE_DOCK_ADDRESS + mDockAddress, true); - editor.commit(); + editor.startCommit(); } } } |