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

Commit 0dd2dbe5 authored by Stanley Tng's avatar Stanley Tng Committed by Gerrit Code Review
Browse files

Merge "Change the feature flag for Hearing Aid behavior"

parents 50b8cd2c 0d6920e4

android/app/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -395,8 +395,7 @@ 
        </service>

        <service

            android:process="@string/process"

            android:name = ".hearingaid.HearingAidService"

            android:enabled="@bool/profile_supported_hearing_aid">

            android:name = ".hearingaid.HearingAidService">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothHearingAid" />

            </intent-filter>

android/app/src/com/android/bluetooth/btservice/Config.java

+3 −3
Original line number Diff line number Diff line
@@ -119,10 +119,10 @@ public class Config { 
        for (ProfileConfig config : PROFILE_SERVICES_AND_FLAGS) {

            boolean supported = resources.getBoolean(config.mSupported);



            if (supported && (config.mClass == HearingAidService.class) && !FeatureFlagUtils

            if (!supported && (config.mClass == HearingAidService.class) && FeatureFlagUtils

                                .isEnabled(ctx, FeatureFlagUtils.HEARING_AID_SETTINGS)) {

                Log.v(TAG, "Feature Flag disables support for HearingAidService");

                supported = false;

                Log.v(TAG, "Feature Flag enables support for HearingAidService");

                supported = true;

            }



            if (supported && !isProfileDisabled(ctx, config.mMask)) {