From eb3e79e9e19c2745772c434ff2f2b1527a397f0a Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Fri, 17 May 2024 18:27:37 +0800
Subject: [PATCH 1/2] Move PRODUCT_SHIPPING_API_LEVEL to define by device

Bug: 312876454
Change-Id: I4efc71932bf347939eed6617817c8219904f66c7
---
 device-caiman.mk        | 2 ++
 device-komodo.mk        | 2 ++
 device-ripcurrent24.mk  | 2 ++
 device-ripcurrentpro.mk | 2 ++
 device-tokay.mk         | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/device-caiman.mk b/device-caiman.mk
index 9787966d..4ed5a9ce 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_CAIMAN_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR)
 endif
diff --git a/device-komodo.mk b/device-komodo.mk
index a9729448..e36be0b1 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_KOMODO_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_KOMODO_RADIO_DIR)
 endif
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index e5cd9146..ffacfa1a 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR)
 endif
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 5113cad0..4b6bbf43 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR)
 endif
diff --git a/device-tokay.mk b/device-tokay.mk
index 48dd18a8..150b6e69 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+SHIPPING_API_LEVEL := 34
+
 ifdef RELEASE_GOOGLE_TOKAY_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIO_DIR)
 endif

From c5abced669900ea0fdc2e098fe5933a04f7d6c76 Mon Sep 17 00:00:00 2001
From: shihchienc <shihchienc@google.com>
Date: Fri, 21 Jun 2024 08:42:40 +0000
Subject: [PATCH 2/2] [Thread] remove thread hal

This is a workaround to avoid release blocker in the current release.
Remove the service to not trigger the related teset. Original fix would
be included in the next release.

Bug: 348316291
Flag: NONE workaround to not trigger test
Test: build pass and check
Change-Id: I29043ea8a1e9f7e954204451998e666de1d171a1
---
 device-caiman.mk        | 6 ------
 device-komodo.mk        | 6 ------
 device-ripcurrentpro.mk | 4 ----
 device-tokay.mk         | 6 ------
 4 files changed, 22 deletions(-)

diff --git a/device-caiman.mk b/device-caiman.mk
index b2b2aa2d..56b02b80 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -434,9 +434,3 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.thread_dispatcher.enabled=true
-
-# Thread HAL
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.caimito.hardware.threadnetwork
-endif
diff --git a/device-komodo.mk b/device-komodo.mk
index 619e79ca..0084c88b 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -435,9 +435,3 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.thread_dispatcher.enabled=true
-
-# Thread HAL
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.caimito.hardware.threadnetwork
-endif
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 43c4c1ab..c02b7190 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -243,7 +243,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 # PKVM Memory Reclaim
 PRODUCT_VENDOR_PROPERTIES += \
     hypervisor.memory_reclaim.supported=1
-
-# Thread HAL
-PRODUCT_PACKAGES += \
-   com.google.caimito.hardware.threadnetwork
diff --git a/device-tokay.mk b/device-tokay.mk
index ca1f0bc1..ca3e3d44 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -406,9 +406,3 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.thread_dispatcher.enabled=true
-
-# Thread HAL
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-   com.google.caimito.hardware.threadnetwork
-endif