summaryrefslogtreecommitdiffstats
path: root/core/java/android/server
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-27 11:21:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-27 11:21:13 -0700
commit6b50986a6b64fa3cbe4d527137134cd14d0ad6bd (patch)
tree675fba769d4f8e9be7522d6c219ec98806388791 /core/java/android/server
parent225ad9cb184c94e29e4e0fb89d5e7d043e399ca4 (diff)
parent333b8cba996c8ebb8ca55ebfc5cc536bdd64af94 (diff)
downloadframeworks_base-6b50986a6b64fa3cbe4d527137134cd14d0ad6bd.zip
frameworks_base-6b50986a6b64fa3cbe4d527137134cd14d0ad6bd.tar.gz
frameworks_base-6b50986a6b64fa3cbe4d527137134cd14d0ad6bd.tar.bz2
Merge "SharedPreferences$Editor.startCommit()" into gingerbread
Diffstat (limited to 'core/java/android/server')
-rw-r--r--core/java/android/server/BluetoothService.java2
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();
}
}
}