commit e98679e138e73960e7695f0d567fa1abb81db42f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:07:50 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:07:50 2022 +0000
tree fc99c8a7c748fd340dbf671219a6c71e81fd53fa
parent a7191619f320c9c48c0cfc376996ca2836c7a799
parent fe15e94f9d1d0a5d3ac11e3ae71a13899d706c02

Snap for 8564071 from fe15e94f9d1d0a5d3ac11e3ae71a13899d706c02 to mainline-wifi-release

Change-Id: Ibab72b8f2f550fb6c5b80e4a763c38a4c2758dd4

Android.mk

diff --git a/Android.mk b/Android.mk
index 050eaa9..3247a42 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
   bdroid_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
 endif
 
-BDROID_DIR := $(TOP_DIR)system/bt
+BDROID_DIR := $(TOP_DIR)packages/modules/Bluetooth/system
 
 ifeq ($(strip $(USE_BLUETOOTH_BCM4343)),true)
 LOCAL_CFLAGS += -DUSE_BLUETOOTH_BCM4343
@@ -54,6 +54,8 @@
         liblog
 
 LOCAL_MODULE := libbt-vendor
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := broadcom

METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}

src/hardware.c

diff --git a/src/hardware.c b/src/hardware.c
index 701cb86..8f96d60 100644
--- a/src/hardware.c
+++ b/src/hardware.c
@@ -1238,6 +1238,8 @@
         timeout_ms *= 25; // 12.5 or 25 ?
     else if (strstr(hw_cfg_cb.local_chip_name, "BCM4358") != NULL)
         timeout_ms *= 50;
+    else if (strstr(hw_cfg_cb.local_chip_name, "BCM43013") != NULL)
+        timeout_ms *= 1;
     else
         timeout_ms *= 300;
 

src/upio.c

diff --git a/src/upio.c b/src/upio.c
index 1a88e28..5050393 100644
--- a/src/upio.c
+++ b/src/upio.c
@@ -124,7 +124,7 @@
 {
     char value[PROPERTY_VALUE_MAX];
 
-    property_get("ro.kernel.qemu", value, "0");
+    property_get("ro.boot.qemu", value, "0");
     UPIODBG("is_emulator_context : %s", value);
     if (strcmp(value, "1") == 0) {
         return 1;