Commit: 8302b14c71086bc20629537c31336a6a537e07e5 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: 8302b14c71086bc20629537c31336a6a537e07e5 (tree)
• Time: 2019-07-11 05:30:43
• Author: Andre Eisenbach <eisenbach@goog...>
• Commiter: android-build-merger

Log Message

Switch Nintendo workaround to match by name
am: c14c14fbc4

Change-Id: I89b558a9b3e87b58e15a8358fa66258fc03a882f

Change Summary

• modified: bta/hh/bta_hh_utils.cc

Incremental Difference

--- a/bta/hh/bta_hh_utils.cc
+++ b/bta/hh/bta_hh_utils.cc
@@ -21,6 +21,7 @@
 #if (BTA_HH_INCLUDED == TRUE)
 
 #include "bta_hh_int.h"
+#include "btif/include/btif_storage.h"
 #include "device/include/interop.h"
 #include "osi/include/osi.h"
 
@@ -394,9 +395,14 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(const RawAddress& bd_addr,
         if (ssr_max_latency > BTA_HH_SSR_MAX_LATENCY_DEF)
           ssr_max_latency = BTA_HH_SSR_MAX_LATENCY_DEF;
 
-        if (interop_match_addr(INTEROP_HID_HOST_LIMIT_SNIFF_INTERVAL,
-                               &bd_addr)) {
-          if (ssr_max_latency > 18 /* slots * 0.625ms */) ssr_max_latency = 18;
+        char remote_name[BTM_MAX_REM_BD_NAME_LEN] = "";
+        if (btif_storage_get_stored_remote_name(bd_addr, remote_name)) {
+          if (interop_match_name(INTEROP_HID_HOST_LIMIT_SNIFF_INTERVAL,
+                                 remote_name)) {
+            if (ssr_max_latency > 18 /* slots * 0.625ms */) {
+              ssr_max_latency = 18;
+            }
+          }
         }
 
         *p_max_ssr_lat = ssr_max_latency;