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

Commit e8d5c8fd authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Changes event handling phases for DeviceListPreferenceFragment. 

Bug: 31273140
Test: Manual inspection.

Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
parent ab50807d

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

+5 −5
Original line number Diff line number Diff line
@@ -180,13 +180,13 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
    }



    @Override

    public void onResume() {

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

    public void onStart() {

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

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

        if (mBluetoothEnabler != null) {

            mBluetoothEnabler.resume(getActivity());

        }

        super.onResume();

        super.onStart();



        mInitiateDiscoverable = true;
@@ -206,8 +206,8 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
    }



    @Override

    public void onPause() {

        super.onPause();

    public void onStop() {

        super.onStop();

        if (mBluetoothEnabler != null) {

            mBluetoothEnabler.pause();

        }

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

+4 −4
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ public abstract class DeviceListPreferenceFragment extends 
    abstract void addPreferencesForActivity();



    @Override

    public void onResume() {

        super.onResume();

    public void onStart() {

        super.onStart();

        if (mLocalManager == null || isUiRestricted()) return;



        mLocalManager.setForegroundActivity(getActivity());
@@ -109,8 +109,8 @@ public abstract class DeviceListPreferenceFragment extends 
    }



    @Override

    public void onPause() {

        super.onPause();

    public void onStop() {

        super.onStop();

        if (mLocalManager == null || isUiRestricted()) {

            return;

        }

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

+6 −6
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { 
    private boolean mNeedAuth;

    private String mLaunchPackage;

    private String mLaunchClass;

    private boolean mStartScanOnResume;

    private boolean mStartScanOnStart;



    @Override

    void addPreferencesForActivity() {
@@ -94,18 +94,18 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { 
        super.onCreate(savedInstanceState);

        getActivity().setTitle(getString(R.string.device_picker));

        UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);

        mStartScanOnResume = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)

        mStartScanOnStart = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)

                && (savedInstanceState == null);  // don't start scan after rotation

        setHasOptionsMenu(true);

    }



    @Override

    public void onResume() {

        super.onResume();

    public void onStart() {

        super.onStart();

        addCachedDevices();

        if (mStartScanOnResume) {

        if (mStartScanOnStart) {

            mLocalAdapter.startScanning(true);

            mStartScanOnResume = false;

            mStartScanOnStart = false;

        }

    }