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

Commit 370a8ae8 authored by Stanley Tng's avatar Stanley Tng
Browse files

Add 2 new ways to check for Support for Hearing Aids Profile 

The getProfileProxy will return false if Hearing Aids Profile is not
supported. Also the getSupportedProfiles will return the correct support
for Hearing Aids even when Bluetooth is disabled.

Test: Manual testing with configuration enabled and disabled.
Bug: 119617521
Change-Id: I146bd3bc36d4c474f7bca18a05b679fb8e70ca63
parent 2d4e9092

framework/java/android/bluetooth/BluetoothAdapter.java

+24 −2
Original line number Diff line number Diff line
@@ -1872,6 +1872,20 @@ public final class BluetoothAdapter { 
        return 0;

    }



    /**

     * Return true if Hearing Aid Profile is supported.

     *

     * @return true if phone supports Hearing Aid Profile

     */

    private boolean isHearingAidProfileSupported() {

        try {

            return mManagerService.isHearingAidProfileSupported();

        } catch (RemoteException e) {

            Log.e(TAG, "remote expection when calling isHearingAidProfileSupported", e);

            return false;

        }

    }



    /**

     * Get the maximum number of connected audio devices.

     *
@@ -2024,6 +2038,11 @@ public final class BluetoothAdapter { 
                            supportedProfiles.add(i);

                        }

                    }

                } else {

                    // Bluetooth is disabled. Just fill in known supported Profiles

                    if (isHearingAidProfileSupported()) {

                        supportedProfiles.add(BluetoothProfile.HEARING_AID);

                    }

                }

            }

        } catch (RemoteException e) {
@@ -2498,8 +2517,11 @@ public final class BluetoothAdapter { 
            BluetoothHidDevice hidDevice = new BluetoothHidDevice(context, listener);

            return true;

        } else if (profile == BluetoothProfile.HEARING_AID) {

            if (isHearingAidProfileSupported()) {

                BluetoothHearingAid hearingAid = new BluetoothHearingAid(context, listener);

                return true;

            }

            return false;

        } else {

            return false;

        }

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+15 −2
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private int mErrorRecoveryRetryCounter;

    private final int mSystemUiUid;



    private boolean mIsHearingAidProfileSupported;



    // Save a ProfileServiceConnections object for each of the bound

    // bluetooth profile services

    private final Map<Integer, ProfileServiceConnections> mProfileServices = new HashMap<>();
@@ -391,13 +393,19 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        mCallbacks = new RemoteCallbackList<IBluetoothManagerCallback>();

        mStateChangeCallbacks = new RemoteCallbackList<IBluetoothStateChangeCallback>();



        mIsHearingAidProfileSupported = context.getResources()

                .getBoolean(com.android.internal.R.bool.config_hearing_aid_profile_supported);



        // TODO: We need a more generic way to initialize the persist keys of FeatureFlagUtils

        boolean isHearingAidEnabled;

        String value = SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + FeatureFlagUtils.HEARING_AID_SETTINGS);

        if (!TextUtils.isEmpty(value)) {

            isHearingAidEnabled = Boolean.parseBoolean(value);

            boolean isHearingAidEnabled = Boolean.parseBoolean(value);

            Log.v(TAG, "set feature flag HEARING_AID_SETTINGS to " + isHearingAidEnabled);

            FeatureFlagUtils.setEnabled(context, FeatureFlagUtils.HEARING_AID_SETTINGS, isHearingAidEnabled);

            if (isHearingAidEnabled && !mIsHearingAidProfileSupported) {

                // Overwrite to enable support by FeatureFlag

                mIsHearingAidProfileSupported = true;

            }

        }



        IntentFilter filter = new IntentFilter();
@@ -679,6 +687,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        return false;

    }



    @Override

    public boolean isHearingAidProfileSupported() {

        return mIsHearingAidProfileSupported;

    }



    // Monitor change of BLE scan only mode settings.

    private void registerForBleScanModeChange() {

        ContentObserver contentObserver = new ContentObserver(null) {