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

Commit c3080549 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove git conflict marker tokens"

parents 3400a9f4 aa32e992

system/audio_a2dp_hw/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ cc_defaults { 
}



// Audio A2DP shared library for target

// ========================================================

cc_library {

    name: "audio.a2dp.default",

    defaults: ["audio_a2dp_hw_defaults"],
@@ -44,7 +43,6 @@ cc_library_static { 
}



// Audio A2DP library unit tests for target and host

// ========================================================

cc_test {

    name: "net_test_audio_a2dp_hw",

    test_suites: ["device-tests"],

system/audio_hal_interface/Android.bp

+0 −2
Original line number Diff line number Diff line 
// Bluetooth Audio library for target

// ========================================================

package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import
@@ -56,7 +55,6 @@ cc_library_static { 
}



// Bluetooth Audio client interface library unit tests for target and host

// ========================================================

cc_test {

    name: "bluetooth-test-audio-hal-interface",

    defaults: ["fluoride_defaults"],

system/audio_hearing_aid_hw/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ cc_defaults { 
}



// Audio A2DP shared library for target

// ========================================================

cc_library {

    name: "audio.hearing_aid.default",

    defaults: ["audio_hearing_aid_hw_defaults"],
@@ -32,7 +31,6 @@ cc_library { 
}



// Audio A2DP library unit tests for target and host

// ========================================================

cc_test {

    name: "net_test_audio_hearing_aid_hw",

    test_suites: ["device-tests"],

system/bta/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ cc_defaults { 
}



// BTA static library for target

// ========================================================

cc_library_static {

    name: "libbt-bta",

    defaults: ["fluoride_bta_defaults"],
@@ -123,7 +122,6 @@ cc_library_static { 
}



// bta unit tests for target

// ========================================================

cc_test {

    name: "net_test_bta",

    defaults: ["fluoride_bta_defaults"],
@@ -214,7 +212,6 @@ cc_test { 
}



// bta hf client add record tests for target

// ========================================================

cc_test {

    name: "net_test_hf_client_add_record",

    defaults: ["fluoride_defaults"],
@@ -245,7 +242,6 @@ cc_test { 




// bta unit tests for host

// ========================================================

cc_test {

    name: "bluetooth_vc_test",

    test_suites: ["device-tests"],

system/bta/gatt/bta_gattc_cache.cc

+4 −4
Original line number Diff line number Diff line
@@ -95,22 +95,22 @@ typedef struct { 


/* debug function to display the server cache */

static void bta_gattc_display_cache_server(const Database& database) {

  LOG(INFO) << "<================Start Server Cache =============>";

  LOG(INFO) << "<=--------------=Start Server Cache =-----------=>";

  std::istringstream iss(database.ToString());

  for (std::string line; std::getline(iss, line);) {

    LOG(INFO) << line;

  }

  LOG(INFO) << "<================End Server Cache =============>";

  LOG(INFO) << "<=--------------=End Server Cache =-----------=>";

}



/** debug function to display the exploration list */

static void bta_gattc_display_explore_record(const DatabaseBuilder& database) {

  LOG(INFO) << "<================Start Explore Queue =============>";

  LOG(INFO) << "<=--------------=Start Explore Queue =-----------=>";

  std::istringstream iss(database.ToString());

  for (std::string line; std::getline(iss, line);) {

    LOG(INFO) << line;

  }

  LOG(INFO) << "<================ End Explore Queue =============>";

  LOG(INFO) << "<=--------------= End Explore Queue =-----------=>";

}

#endif /* BTA_GATT_DEBUG == TRUE */