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

Fix NPE in bluetooth Permission Activity

Browse Source 
This fixes a NPE by ensuring that cached device  list has
a cached device associated with a given BDA before accessing
the cached device
Bug:5964529

Change-Id: Ib2c3596e6e008c78f9f1137134e421ca710e1217
This commit is contained in:
Ganesh Ganapathi Batta
2012-09-10 11:13:54 -07:00
committed by Matthew Xie
parent 6665ee3210
commit 40b77fe04b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java Normal file → Executable file
View File

@@ -251,6 +251,13 @@ public class BluetoothPermissionActivity extends AlertActivity implements
CachedBluetoothDeviceManager cachedDeviceManager = CachedBluetoothDeviceManager cachedDeviceManager =
bluetoothManager.getCachedDeviceManager(); bluetoothManager.getCachedDeviceManager();
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice); CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
if (cachedDevice != null ) {
cachedDevice.setPhonebookPermissionChoice(permissionChoice);
} else {
cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
bluetoothManager.getProfileManager(),
mDevice);
cachedDevice.setPhonebookPermissionChoice(permissionChoice); cachedDevice.setPhonebookPermissionChoice(permissionChoice);
} }
} }
}