diff options
author | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-14 09:26:51 -0700 |
---|---|---|
committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-14 09:26:51 -0700 |
commit | c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb (patch) | |
tree | 0fe5f7ca6757baa4ad1b9ad2b5f3974648c94bf6 | |
parent | e714898a1abfd828a239e1be7b3f75e2a3cc2120 (diff) | |
download | packages_apps_Settings-c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb.zip packages_apps_Settings-c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb.tar.gz packages_apps_Settings-c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb.tar.bz2 |
Use new apply() instead of commit().
apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.
Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9
5 files changed, 9 insertions, 10 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java index eec0ad8..37e48ff 100644 --- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java @@ -144,7 +144,7 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan private void persistDiscoverableEndTimestamp(long endTimestamp) { SharedPreferences.Editor editor = mLocalManager.getSharedPreferences().edit(); editor.putLong(SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, endTimestamp); - editor.commit(); + editor.apply(); } private void handleModeChanged(int mode) { diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java index dbdf6c1..cc3db6e 100644 --- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java +++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java @@ -199,6 +199,6 @@ public class BluetoothEventRedirector { SharedPreferences.Editor editor = mManager.getSharedPreferences().edit(); editor.putLong(LocalBluetoothManager.SHARED_PREFERENCES_KEY_DISCOVERING_TIMESTAMP, System.currentTimeMillis()); - editor.commit(); + editor.apply(); } } diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java index d0f8099..db24554 100644 --- a/src/com/android/settings/bluetooth/DockService.java +++ b/src/com/android/settings/bluetooth/DockService.java @@ -788,14 +788,14 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli SharedPreferences.Editor editor = getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE).edit(); editor.putBoolean(key, bool); - editor.commit(); + editor.apply(); } private void setSettingInt(String key, int value) { SharedPreferences.Editor editor = getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE).edit(); editor.putInt(key, value); - editor.commit(); + editor.apply(); } private void removeSetting(String key) { @@ -803,8 +803,7 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli Context.MODE_PRIVATE); SharedPreferences.Editor editor = sharedPref.edit(); editor.remove(key); - editor.commit(); - return; + editor.apply(); } public synchronized void onServiceConnected() { diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java index 2ffb139..97e823e 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java @@ -356,7 +356,7 @@ public class LocalBluetoothManager { deviceAddress); editor.putLong(LocalBluetoothManager.SHARED_PREFERENCES_KEY_LAST_SELECTED_DEVICE_TIME, System.currentTimeMillis()); - editor.commit(); + editor.apply(); } public boolean hasDockAutoConnectSetting(String addr) { @@ -371,12 +371,12 @@ public class LocalBluetoothManager { public void saveDockAutoConnectSetting(String addr, boolean autoConnect) { SharedPreferences.Editor editor = getSharedPreferences().edit(); editor.putBoolean(SHARED_PREFERENCES_KEY_DOCK_AUTO_CONNECT + addr, autoConnect); - editor.commit(); + editor.apply(); } public void removeDockAutoConnectSetting(String addr) { SharedPreferences.Editor editor = getSharedPreferences().edit(); editor.remove(SHARED_PREFERENCES_KEY_DOCK_AUTO_CONNECT + addr); - editor.commit(); + editor.apply(); } } diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java index eca233c..dd802f3 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java @@ -277,7 +277,7 @@ public class RequestPermissionActivity extends Activity implements editor.putLong( BluetoothDiscoverableEnabler.SHARED_PREFERENCES_KEY_DISCOVERABLE_END_TIMESTAMP, endTimestamp); - editor.commit(); + editor.apply(); } @Override |