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

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

Merge "Remove config files from /system partition" into tm-dev

parents 1f827b74 504075ed

android/app/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -150,13 +150,6 @@ android_app { 
        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "android.hardware.bluetooth.audio-V1-ndk",

        "audio_set_configurations_bfbs",

        "audio_set_configurations_json",

        "audio_set_scenarios_bfbs",

        "audio_set_scenarios_json",

        "bt_did.conf",

        "bt_stack.conf",

        "privapp_allowlist_com.android.bluetooth.services.xml",

    ],

    apex_available: [

        "com.android.bluetooth",

system/bta/le_audio/le_audio_set_configuration_provider_json.cc

+8 −6
Original line number Diff line number Diff line
@@ -40,14 +40,16 @@ using ::le_audio::CodecManager; 
#ifdef OS_ANDROID

static const std::vector<

    std::pair<const char* /*schema*/, const char* /*content*/>>

    kLeAudioSetConfigs = {

        {"/system/etc/bluetooth/le_audio/audio_set_configurations.bfbs",

         "/system/etc/bluetooth/le_audio/audio_set_configurations.json"}};

    kLeAudioSetConfigs = {{"/apex/com.android.bluetooth/etc/bluetooth/le_audio/"

                           "audio_set_configurations.bfbs",

                           "/apex/com.android.bluetooth/etc/bluetooth/le_audio/"

                           "audio_set_configurations.json"}};

static const std::vector<

    std::pair<const char* /*schema*/, const char* /*content*/>>

    kLeAudioSetScenarios = {

        {"/system/etc/bluetooth/le_audio/audio_set_scenarios.bfbs",

         "/system/etc/bluetooth/le_audio/audio_set_scenarios.json"}};

    kLeAudioSetScenarios = {{"/apex/com.android.bluetooth/etc/bluetooth/"

                             "le_audio/audio_set_scenarios.bfbs",

                             "/apex/com.android.bluetooth/etc/bluetooth/"

                             "le_audio/audio_set_scenarios.json"}};

#else

static const std::vector<

    std::pair<const char* /*schema*/, const char* /*content*/>>

system/btif/src/btif_core.cc

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ static void bt_jni_msg_ready(void* context); 
#elif defined(OS_GENERIC)

#define BTE_DID_CONF_FILE "bt_did.conf"

#else  // !defined(OS_GENERIC)

#define BTE_DID_CONF_FILE "/etc/bluetooth/bt_did.conf"

#define BTE_DID_CONF_FILE \

  "/apex/com.android.bluetooth/etc/bluetooth/bt_did.conf"

#endif  // defined(OS_GENERIC)

#endif  // BTE_DID_CONF_FILE

system/main/stack_config.cc

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static future_t* init() { 
#elif defined(OS_GENERIC)

  const char* path = "bt_stack.conf";

#else  // !defined(OS_GENERIC)

  const char* path = "/etc/bluetooth/bt_stack.conf";

  const char* path = "/apex/com.android.bluetooth/etc/bluetooth/bt_stack.conf";

#endif  // defined(OS_GENERIC)

  CHECK(path != NULL);