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

am 0a022541: am 38badc8b: am 9463c2f8: b/2320107 NPE when receiving a Undock event without a device

Browse Source 
Merge commit '0a0225418366e4502e18e414e71a04d575b1a47e'

* commit '0a0225418366e4502e18e414e71a04d575b1a47e':
  b/2320107 NPE when receiving a Undock event without a device
This commit is contained in:
Michael Chan
2009-12-11 12:25:55 -08:00
committed by Android Git Automerger
parent 62698165f4 0a02254183
commit 46c176d112
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ public class BluetoothEventRedirector {
int anythingButUnDocked = Intent.EXTRA_DOCK_STATE_UNDOCKED + 1; int anythingButUnDocked = Intent.EXTRA_DOCK_STATE_UNDOCKED + 1;
int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, anythingButUnDocked); int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, anythingButUnDocked);
if (state == Intent.EXTRA_DOCK_STATE_UNDOCKED) { if (state == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
if (device.getBondState() == BluetoothDevice.BOND_NONE) { if (device != null && device.getBondState() == BluetoothDevice.BOND_NONE) {
mManager.getCachedDeviceManager().onDeviceDisappeared(device); mManager.getCachedDeviceManager().onDeviceDisappeared(device);
} }
} }