From a1bf91548791dc4d2daa8e57d00a5d13f860f2b9 Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Tue, 5 Mar 2024 23:45:49 -0800 Subject: [PATCH 1/3] Adding android.software.contextualsearch to gs-101 devices. Bug: 326143814 Test: Built and tested on device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ff9169f2f92191802e70fadb83810d03d2e9952) Merged-In: Id45a24ec3361caade132836e5e849940efa6ac2c Change-Id: Id45a24ec3361caade132836e5e849940efa6ac2c --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 9edf65e8..4df284d1 100644 --- a/device.mk +++ b/device.mk @@ -239,6 +239,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ + frameworks/native/data/etc/android.software.contextualsearch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.contextualsearch.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml From b089fb2aab75b1f0e362c62f0a6f10fc1837cfef Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 2/3] Revert "Add betterbug mk to gs101" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Bug: b/327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a43fedce4ef60251336a86c470250b2dfb8c9f3e) Merged-In: I88a445da895c373c0a53c8a2f08726582c27be77 Change-Id: I88a445da895c373c0a53c8a2f08726582c27be77 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 4df284d1..3f642856 100644 --- a/device.mk +++ b/device.mk @@ -36,7 +36,6 @@ include device/google/gs-common/sota_app/factoryota.mk include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk -include device/google/gs-common/betterbug/betterbug.mk ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From d52185d3619618ed216d5f82f623527adce10e82 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Fri, 22 Mar 2024 21:00:04 +0800 Subject: [PATCH 3/3] Update health AIDL HAL to V3 Bug: 328332299 Test: TH Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Signed-off-by: Jack Wu (cherry picked from https://android-review.googlesource.com/q/commit:f143d6803bd64b123306788e4e02670a829c3258) Merged-In: I57ff2ec2758f965a9e13e53f223c735a9d102219 Change-Id: I57ff2ec2758f965a9e13e53f223c735a9d102219 --- health/android.hardware.health-service.gs101.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health/android.hardware.health-service.gs101.xml b/health/android.hardware.health-service.gs101.xml index 1fe9b8d2..2acaabac 100644 --- a/health/android.hardware.health-service.gs101.xml +++ b/health/android.hardware.health-service.gs101.xml @@ -1,7 +1,7 @@ android.hardware.health - 2 + 3 IHealth/default