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

Merge "Emulator: avoid accessing null BluetoothAdapter" into nyc-dev

Browse Source 
am: 9b9ca65db9

* commit '9b9ca65db9a0692c2381eb0a68a02ab6325fc7db':
  Emulator: avoid accessing null BluetoothAdapter
This commit is contained in:
Bo Hu
2016-02-24 22:21:10 +00:00
committed by android-build-merger
parent 693f78c929 9b9ca65db9
commit 11e94adaec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -496,8 +496,9 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
@Override @Override
public void setListening(boolean listening) { public void setListening(boolean listening) {
BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
if (defaultAdapter == null) return;
if (listening) { if (listening) {
BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
mEnabled = defaultAdapter.isEnabled(); mEnabled = defaultAdapter.isEnabled();
mConnected = mConnected =
defaultAdapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED; defaultAdapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED;