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

Commit b711f01e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: Migration should only occur on Android" am: 2529df54 am:... 

Merge "floss: Migration should only occur on Android" am: 2529df54 am: ca7e96d3 am: ceae3f37 am: 6cb7f7e8

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



Change-Id: I37f5f88b3ddc1a5dfe766f9720ccc661a368d281
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2cca684e 6cb7f7e8

system/btif/src/bluetooth.cc

+4 −0
Original line number Diff line number Diff line
@@ -172,9 +172,11 @@ static bool is_profile(const char* p1, const char* p2) { 
 *

 ****************************************************************************/



#ifdef OS_ANDROID

const std::vector<std::string> get_allowed_bt_package_name(void);

void handle_migration(const std::string& dst,

                      const std::vector<std::string>& allowed_bt_package_name);

#endif



static int init(bt_callbacks_t* callbacks, bool start_restricted,

                bool is_common_criteria_mode, int config_compare_result,
@@ -186,10 +188,12 @@ static int init(bt_callbacks_t* callbacks, bool start_restricted, 
      __func__, start_restricted, is_common_criteria_mode,

      config_compare_result);



#ifdef OS_ANDROID

  if (user_data_directory != nullptr) {

    handle_migration(std::string(user_data_directory),

                     get_allowed_bt_package_name());

  }

#endif



  bluetooth::common::InitFlags::Load(init_flags);