diff options
| author | bohu <bohu@google.com> | 2018-12-18 12:18:45 -0800 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2018-12-18 12:30:58 -0800 |
| commit | abe91dbc3ea41009411776e630325e536b82d788 (patch) | |
| tree | 14095f636a4c63b58c0e7630f87dd40f300d1224 /core/java/android/bluetooth/BluetoothManager.java | |
| parent | 0b6adaab7a2ed82b1fafac0241b523d0c7f3b532 (diff) | |
bluetooth: fix crash on accessing null adapter
By checking bluetooth adaptor before accessing it,
because it could be null on devices that do not
support bluetooth, such as android emulator.
BUG: 121129248
Test:
lunch sdk_gphone_x86-userdebug
make -j
emulator
launch chrome and it should not crash
Change-Id: Ia75b5ee1efa3a8195056dada079239931eb9d901
Diffstat (limited to 'core/java/android/bluetooth/BluetoothManager.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothManager.java b/core/java/android/bluetooth/BluetoothManager.java index e08d405324ea..adedff3e9386 100644 --- a/core/java/android/bluetooth/BluetoothManager.java +++ b/core/java/android/bluetooth/BluetoothManager.java @@ -67,7 +67,9 @@ public final class BluetoothManager { } // Legacy api - getDefaultAdapter does not take in the context mAdapter = BluetoothAdapter.getDefaultAdapter(); - mAdapter.setContext(context); + if (mAdapter != null) { + mAdapter.setContext(context); + } } /** |