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 /core/java/android/server | |
| 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 '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 1808656..b732675 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -2138,7 +2138,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(); } } } |