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

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

Merge "Remove do_not_replace_existing_cod_with_uncategorized_cod flag" into... 

Merge "Remove do_not_replace_existing_cod_with_uncategorized_cod flag" into main am: 1af41541 am: 3a788cad

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



Change-Id: I30a6f3939f8f2be90348f08e386ab01ed85f7481
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e029332 3a788cad

flags/btif_dm.aconfig

+0 −10
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "do_not_replace_existing_cod_with_uncategorized_cod"

    namespace: "bluetooth"

    description: "Don't replace an existing stored class of device with one determined to be uncategorized"

    bug: "335909751"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "read_model_num_fix"

    namespace: "bluetooth"

system/btif/src/btif_dm.cc

+2 −5
Original line number Diff line number Diff line
@@ -1373,12 +1373,9 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, tBTA_DM_SEARCH* 
             don't want this to replace the existing value below when we call

             btif_storage_add_remote_device */

          uint32_t old_cod = get_cod(&bdaddr);

          if (com::android::bluetooth::flags::

                      do_not_replace_existing_cod_with_uncategorized_cod()) {

          if (cod == COD_UNCLASSIFIED && old_cod != 0) {

            cod = old_cod;

          }

          }



          if (old_cod != cod) {

            log::info("{} CoD: 0x{:06x} -> 0x{:06x}", bdaddr, old_cod, cod);