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

am: 99eab3d5f9 Change-Id: I7c78e818010bb513dd2ac1d65baa00f4159073b1
2017-07-11 21:26:09 +00:00
parent 80b65d4328 99eab3d5f9
commit 549d864bbf
1 changed files with 2 additions and 4 deletions
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -70,11 +70,9 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme
    public void onStart() {
        super.onStart();

-        if (mLocalAdapter != null) {
        updateContent(mLocalAdapter.getBluetoothState());
        mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
    }
-    }

    @Override
    public void onStop() {