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

Commit f9b54878 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change the feature flag for Hearing Aid behavior" into pi-dev

parents a74e5756 f35d2f3d

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -393,8 +393,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>

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)) {