commit 5468ebfe88ee05767dd26d15e45bec728f60c41d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 19 18:26:39 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 19 18:26:39 2018 +0000
tree 474ec273d95dab988d89c7ac02d1572f7210e02a
parent 4cb6f342ff4aad806390de09d09770640f8d1c4a
parent abe91dbc3ea41009411776e630325e536b82d788

Merge "bluetooth: fix crash on accessing null adapter"

core/java/android/bluetooth/BluetoothManager.java

diff --git a/core/java/android/bluetooth/BluetoothManager.java b/core/java/android/bluetooth/BluetoothManager.java
index e08d405..adedff3 100644
--- a/core/java/android/bluetooth/BluetoothManager.java
+++ b/core/java/android/bluetooth/BluetoothManager.java
@@ -67,7 +67,9 @@
         }
         // Legacy api - getDefaultAdapter does not take in the context
         mAdapter = BluetoothAdapter.getDefaultAdapter();
-        mAdapter.setContext(context);
+        if (mAdapter != null) {
+            mAdapter.setContext(context);
+        }
     }
 
     /**