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

am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.

Browse Source 
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-mr2

* commit '052ad24219bbb170d9d028a460741524a768915a':
  b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
This commit is contained in:
Michael Chan
2009-12-14 11:49:24 -08:00
committed by Android Git Automerger
parent 20428ffbc1 052ad24219
commit 2321e1dca0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,7 +331,9 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
// Called when the "Remember" Checkbox is clicked
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (DEBUG) Log.d(TAG, "onCheckedChanged: Remember Settings = " + isChecked);
mBtManager.saveDockAutoConnectSetting(mDevice.getAddress(), isChecked);
if (mDevice != null) {
mBtManager.saveDockAutoConnectSetting(mDevice.getAddress(), isChecked);
}
}
// Called when the dialog is dismissed
@@ -346,7 +348,7 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
// Called when clicked on the OK button
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
if (which == DialogInterface.BUTTON_POSITIVE && mDevice != null) {
if (!mBtManager.hasDockAutoConnectSetting(mDevice.getAddress())) {
mBtManager.saveDockAutoConnectSetting(mDevice.getAddress(), true);
}