PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c5c8dad0: Use new apply() instead of commit().

Browse Source 
Merge commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb' into gingerbread-plus-aosp

* commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb':
  Use new apply() instead of commit().
This commit is contained in:
Brad Fitzpatrick
2010-09-14 10:29:35 -07:00
committed by Android Git Automerger
parent 1647d472a8 c5c8dad0af
commit f8a473c398
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
View File

@@ -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) {

2
src/com/android/settings/bluetooth/BluetoothEventRedirector.java
View File

@@ -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();
}
}

7
src/com/android/settings/bluetooth/DockService.java
View File

@@ -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() {

6
src/com/android/settings/bluetooth/LocalBluetoothManager.java
View File

@@ -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();
}
}

2
src/com/android/settings/bluetooth/RequestPermissionActivity.java
View File

@@ -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