commit 618d7341f5d1cb0bf43ed10b7d26ae1c4f98b3f2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 20 00:33:07 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 20 00:33:07 2022 +0000
tree 589a71490df725ee3dba6a73aa6dc6f832c90c5d
parent 6f8f229aacae00052e5b46b2029b0a561ab6779f
parent 299a14d134b7589cecec588a89a44c3ef4b800b1

Snap for 8618812 from 299a14d134b7589cecec588a89a44c3ef4b800b1 to mainline-tzdata4-release

Change-Id: I04392af42dc66df1955bca3b72dcb75051b699ec

guest/hals/ril/reference-ril/reference-ril.c

diff --git a/guest/hals/ril/reference-ril/reference-ril.c b/guest/hals/ril/reference-ril/reference-ril.c
index 5d39ff1..806a178 100644
--- a/guest/hals/ril/reference-ril/reference-ril.c
+++ b/guest/hals/ril/reference-ril/reference-ril.c
@@ -208,7 +208,7 @@
 #define CDMA  (RAF_IS95A | RAF_IS95B | RAF_1xRTT)
 #define EVDO  (RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_EHRPD)
 #define WCDMA (RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP | RAF_UMTS)
-#define LTE   (RAF_LTE | RAF_LTE_CA)
+#define LTE   (RAF_LTE)
 #define NR    (RAF_NR)
 
 typedef struct {

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 94446b1..04dedbd 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -455,6 +455,12 @@
 endif
 
 #
+# Bluetooth Audio AIDL HAL
+#
+PRODUCT_PACKAGES += \
+    android.hardware.bluetooth.audio-impl \
+
+#
 # Audio HAL
 #
 ifndef LOCAL_AUDIO_PRODUCT_PACKAGE

tests/hal/hal_implementation_test.cpp

diff --git a/tests/hal/hal_implementation_test.cpp b/tests/hal/hal_implementation_test.cpp
index d9fe971..eaefd87 100644
--- a/tests/hal/hal_implementation_test.cpp
+++ b/tests/hal/hal_implementation_test.cpp
@@ -184,20 +184,8 @@
     // types-only packages, which never expect a default implementation
     {"android.hardware.radio.", 1},
 
-    // No implementations of radio v2 on cuttlefish
-    {"android.hardware.radio.config.", 2},
-    {"android.hardware.radio.data.", 2},
-    {"android.hardware.radio.messaging.", 2},
-    {"android.hardware.radio.modem.", 2},
-    {"android.hardware.radio.network.", 2},
-    {"android.hardware.radio.sim.", 2},
-    {"android.hardware.radio.voice.", 2},
-
     // types-only packages, which never expect a default implementation
     {"android.hardware.uwb.fira_android.", 1},
-
-    // These versions need to be implemented (b/203490261)
-    {"android.hardware.bluetooth.audio.", 1},
 };
 
 static const std::set<VersionedAidlPackage> kComingSoonAidl = {