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

Commit 117a2c82 authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Code sync with aosp to resolve merge conflict 

Test: build
Ignore-AOSP-First: Resolving merge conflict
Change-Id: I58227a6bc688b4eaeed6aea3a846219e0cb7b3eb
parent b580c94f

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

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.HashSet;

import java.util.Iterator;

import java.util.Set;



public class Config {

    private static final String TAG = "AdapterServiceConfig";
@@ -62,11 +63,19 @@ public class Config { 
    private static final String FEATURE_BATTERY = "settings_bluetooth_battery";

    private static long sSupportedMask = 0;



    private static final String FFLAG_OVERRIDE_PREFIX = "sys.fflag.override.";

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



    private static final String LE_AUDIO_DYNAMIC_SWITCH_PROPERTY =

            "ro.bluetooth.leaudio_switcher.supported";

    private static final String LE_AUDIO_DYNAMIC_ENABLED_PROPERTY =

            "persist.bluetooth.leaudio_switcher.enabled";



    private static final Set<String> PERSISTENT_FLAGS = Set.of(

            FEATURE_HEARING_AID,

            FEATURE_BATTERY

    );



    private static class ProfileConfig {

        Class mClass;

        boolean mSupported;