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

am: 86fd147ac6 Change-Id: Ib56a1d03e9e74632137117802a5baab3870947bb
2017-07-11 21:22:40 +00:00
parent e549e732bd 86fd147ac6
commit 99eab3d5f9
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,10 +70,8 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme
    public void onStart() {
        super.onStart();

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

    @Override