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

Commit f95c7aa4 authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "[Invisalign] Split apart storage and profile_storage" am: e65ba25c... 

Merge "[Invisalign] Split apart storage and profile_storage" am: e65ba25c am: 133d5c3d am: 8c9bcdb9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2302400



Change-Id: I3cca78e2e59deae176c65015927da7ec106c889d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae8d4473 8c9bcdb9

system/bta/csis/csis_client_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "bta_dm_api_mock.h"

#include "bta_gatt_api_mock.h"

#include "bta_gatt_queue_mock.h"

#include "btif_storage.h"

#include "btif_profile_storage.h"

#include "btm_api_mock.h"

#include "csis_types.h"

#include "gatt/database_builder.h"

system/bta/groups/groups.cc

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <unordered_set>



#include "bta_groups.h"

#include "btif_storage.h"

#include "btif_profile_storage.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

system/bta/le_audio/client.cc

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "bta_gatt_queue.h"

#include "bta_groups.h"

#include "bta_le_audio_api.h"

#include "btif_storage.h"

#include "btif_profile_storage.h"

#include "btm_iso_api.h"

#include "client_parser.h"

#include "codec_manager.h"

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ cc_defaults { 
        "src/btif_metrics_logging.cc",

        "src/btif_pan.cc",

        "src/btif_profile_queue.cc",

        "src/btif_profile_storage.cc",

        "src/btif_rc.cc",

        "src/btif_sdp.cc",

        "src/btif_sdp_server.cc",

system/btif/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static_library("btif") { 
    "src/btif_metrics_logging.cc",

    "src/btif_pan.cc",

    "src/btif_profile_queue.cc",

    "src/btif_profile_storage.cc",

    "src/btif_rc.cc",

    "src/btif_sdp.cc",

    "src/btif_sdp_server.cc",