Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93724840 authored by Amith Yamasani's avatar Amith Yamasani Committed by Xavier Ducrohet
Browse files

Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge. 

Bug: 6079494

(cherry picked from commit 5fb53f36)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
parent 78ef5443

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

+10 −4
Original line number Diff line number Diff line
@@ -138,21 +138,26 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { 
    public void onResume() {

        // resume BluetoothEnabler before calling super.onResume() so we don't get

        // any onDeviceAdded() callbacks before setting up view in updateContent()

        if (mBluetoothEnabler != null) {

            mBluetoothEnabler.resume();

        }

        super.onResume();



        if (mDiscoverableEnabler != null) {

            mDiscoverableEnabler.resume();

        }

        getActivity().registerReceiver(mReceiver, mIntentFilter);



        if (mLocalAdapter != null) {

            updateContent(mLocalAdapter.getBluetoothState(), mActivityStarted);

        }

    }



    @Override

    public void onPause() {

        super.onPause();

        if (mBluetoothEnabler != null) {

            mBluetoothEnabler.pause();

        }

        getActivity().unregisterReceiver(mReceiver);

        if (mDiscoverableEnabler != null) {

            mDiscoverableEnabler.pause();
@@ -161,6 +166,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment { 


    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        if (mLocalAdapter == null) return;

        boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;

        boolean isDiscovering = mLocalAdapter.isDiscovering();

        int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :

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

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ public abstract class DeviceListPreferenceFragment extends 
    @Override

    public void onResume() {

        super.onResume();

        if (mLocalManager == null) return;



        mLocalManager.setForegroundActivity(getActivity());

        mLocalManager.getEventManager().registerCallback(this);
@@ -106,6 +107,8 @@ public abstract class DeviceListPreferenceFragment extends 
    @Override

    public void onPause() {

        super.onPause();

        if (mLocalManager == null) return;



        removeAllDevices();

        mLocalManager.setForegroundActivity(null);

        mLocalManager.getEventManager().unregisterCallback(this);