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

Commit ef2c1a15 authored by hughchen's avatar hughchen
Browse files

Fix crash when no Bluetooth feature in Settings 

- Move PreferenceGroup init method out of isAvailable() condition,
  then PreferenceGroup will not be null.
- Update getAvailabilityStatus(), since the controller now may have usb
  and dock.

Bug: 110712414
Test: make -j42 RunSettingsRoboTests
Change-Id: I4d85a42c26fb20d319e7321177b271933be3fdb0
parent 96b53495

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

+8 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback, 
     * Force to update the list of bluetooth devices

     */

    public void forceUpdate() {

        if (mLocalManager == null) {

            Log.e(TAG, "forceUpdate() Bluetooth is not supported on this device");

            return;

        }

        if (BluetoothAdapter.getDefaultAdapter().isEnabled()) {

            final Collection<CachedBluetoothDevice> cachedDevices =

                    mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
@@ -119,6 +123,10 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback, 
    }



    public void removeAllDevicesFromPreference() {

        if (mLocalManager == null) {

            Log.e(TAG, "removeAllDevicesFromPreference() BT is not supported on this device");

            return;

        }

        final Collection<CachedBluetoothDevice> cachedDevices =

                mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();

        for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {

src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java

+4 −2
Original line number Diff line number Diff line
@@ -83,9 +83,11 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (isAvailable()) {



        mPreferenceGroup = screen.findPreference(KEY);

        mPreferenceGroup.setVisible(false);



        if (isAvailable()) {

            updateTitle();

            mBluetoothDeviceUpdater.setPrefContext(screen.getContext());

            mBluetoothDeviceUpdater.forceUpdate();

src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java

+9 −4
Original line number Diff line number Diff line
@@ -73,10 +73,11 @@ public class ConnectedDeviceGroupController extends BasePreferenceController 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (isAvailable()) {



        mPreferenceGroup = screen.findPreference(KEY);

        mPreferenceGroup.setVisible(false);



        if (isAvailable()) {

            final Context context = screen.getContext();

            mBluetoothDeviceUpdater.setPrefContext(context);

            mBluetoothDeviceUpdater.forceUpdate();
@@ -88,7 +89,11 @@ public class ConnectedDeviceGroupController extends BasePreferenceController 


    @Override

    public int getAvailabilityStatus() {

        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)

        final PackageManager packageManager = mContext.getPackageManager();

        return (packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)

                || packageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)

                || packageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)

                || mConnectedDockUpdater != null)

                ? AVAILABLE_UNSEARCHABLE

                : UNSUPPORTED_ON_DEVICE;

    }

src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc 


    @Override

    public int getAvailabilityStatus() {

        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)

        return (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)

                || mSavedDockUpdater != null)

                ? AVAILABLE

                : CONDITIONALLY_UNAVAILABLE;

    }

src/com/android/settings/connecteddevice/SavedDeviceGroupController.java

+5 −4
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ public class SavedDeviceGroupController extends BasePreferenceController 


    @Override

    public void displayPreference(PreferenceScreen screen) {

        if (isAvailable()) {

        mPreferenceGroup = screen.findPreference(KEY);

        mPreferenceGroup.setVisible(false);



        if (isAvailable()) {

            final Context context = screen.getContext();

            mBluetoothDeviceUpdater.setPrefContext(context);

            mBluetoothDeviceUpdater.forceUpdate();
@@ -87,7 +87,8 @@ public class SavedDeviceGroupController extends BasePreferenceController 


    @Override

    public int getAvailabilityStatus() {

        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)

        return (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)

                || mSavedDockUpdater != null)

                ? AVAILABLE

                : UNSUPPORTED_ON_DEVICE;

    }