commit 86fd147ac6a5ad976159ec04cc195457d105280c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 11 21:16:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 11 21:16:32 2017 +0000
tree 30c1abe6a730b0e0f392f497d4770d4adbdf5963
parent 89fdea98072caa1d8f619c04d8fb25b447e87f9f
parent a4503c5b8b90b3e9c9124cd596c6f4220a10d3a7

Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev

src/com/android/settings/bluetooth/BluetoothPairingDetail.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index 6545ed1..d7b86c5 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -70,10 +70,8 @@
     public void onStart() {
         super.onStart();
 
-        if (mLocalAdapter != null) {
-            updateContent(mLocalAdapter.getBluetoothState());
-            mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
-        }
+        updateContent(mLocalAdapter.getBluetoothState());
+        mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
     }
 
     @Override