summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-12-14 15:26:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-14 15:26:10 -0800
commit483deed6f3d91329d02bb37af64f032e4eaa3621 (patch)
treea0d3f98e8449115bf44f1c1b8a248f92f8860326
parentdd79e75a0afe65721fcb95b17bd96199a9b7a5b3 (diff)
parent2321e1dca0abfdfca421cbd490b3c4f257d96114 (diff)
downloadpackages_apps_settings-483deed6f3d91329d02bb37af64f032e4eaa3621.zip
packages_apps_settings-483deed6f3d91329d02bb37af64f032e4eaa3621.tar.gz
packages_apps_settings-483deed6f3d91329d02bb37af64f032e4eaa3621.tar.bz2
am 2321e1dc: am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '2321e1dca0abfdfca421cbd490b3c4f257d96114' into eclair-mr2-plus-aosp * commit '2321e1dca0abfdfca421cbd490b3c4f257d96114': b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
-rw-r--r--src/com/android/settings/bluetooth/DockService.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index 484ce86..8e3af9d 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -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);
}