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

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

Merge "Add Feature Flag for Hearing Aid Profile" into pi-dev-plus-aosp

parents 5fa13927 a5866c64

core/java/android/util/FeatureFlagUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ public class FeatureFlagUtils { 
    public static final String FFLAG_PREFIX = "sys.fflag.";

    public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";

    public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts";

    public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;

    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";



    private static final Map<String, String> DEFAULT_FLAGS;

    static {
@@ -46,6 +48,7 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_audio_switcher", "true");

        DEFAULT_FLAGS.put("settings_systemui_theme", "true");

        DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "true");

    }



    /**

services/core/java/com/android/server/BluetoothManagerService.java

+13 −0
Original line number Diff line number Diff line
@@ -53,12 +53,16 @@ import android.os.Process; 
import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManagerInternal;

import android.os.UserManagerInternal.UserRestrictionsListener;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.util.Slog;

import android.util.StatsLog;
@@ -386,6 +390,15 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        mCallbacks = new RemoteCallbackList<IBluetoothManagerCallback>();

        mStateChangeCallbacks = new RemoteCallbackList<IBluetoothStateChangeCallback>();



        // 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);

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

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

        }



        IntentFilter filter = new IntentFilter();

        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);

        filter.addAction(BluetoothAdapter.ACTION_BLUETOOTH_ADDRESS_CHANGED);