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

Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev

Browse Source
This commit is contained in:
Matthew Xie
2012-09-10 12:53:51 -07:00
committed by Android (Google) Code Review
parent de10103302 40b77fe04b
commit cce52bd3a5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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);
cachedDevice.setPhonebookPermissionChoice(permissionChoice); if (cachedDevice != null ) {
cachedDevice.setPhonebookPermissionChoice(permissionChoice);
} else {
cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
bluetoothManager.getProfileManager(),
mDevice);
cachedDevice.setPhonebookPermissionChoice(permissionChoice);
}
} }
} }