diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:12:39 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:12:39 +0000 |
commit | 88f1cb3ac1c4e4e8cbd9b41bc23efef16675facb (patch) | |
tree | fc99c8a7c748fd340dbf671219a6c71e81fd53fa | |
parent | a7191619f320c9c48c0cfc376996ca2836c7a799 (diff) | |
parent | fe15e94f9d1d0a5d3ac11e3ae71a13899d706c02 (diff) | |
download | libbt-android13-mainline-conscrypt-release.tar.gz |
Snap for 8564071 from fe15e94f9d1d0a5d3ac11e3ae71a13899d706c02 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000aml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android14-mainline-conscrypt-releaseandroid13-mainline-conscrypt-release
Change-Id: Ib7facdfc6275d5e1d4218401df7c35da6dc0df9d
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | src/hardware.c | 2 | ||||
-rw-r--r-- | src/upio.c | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -12,7 +12,7 @@ else 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 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 +} 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 @@ uint32_t hw_lpm_get_idle_timeout(void) 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; @@ -124,7 +124,7 @@ static int is_emulator_context(void) { 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; |