From 015c1986eea3f15c27c46c6499f7228aa5881d74 Mon Sep 17 00:00:00 2001 From: Shashwat Razdan Date: Tue, 5 Mar 2024 23:50:00 -0800 Subject: [PATCH 1/2] Adding android.software.contextualsearch to zumapro devices. Bug: 326143814 Test: Built and tested on device (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8122febec5ab0d1d761eacabc2796d77abba0e3a) Merged-In: Idfa95159b310800819742c3e265cf7301138a9cb Change-Id: Idfa95159b310800819742c3e265cf7301138a9cb --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 28e7c1e..a8a35a3 100644 --- a/device.mk +++ b/device.mk @@ -293,6 +293,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 bfcc4709a3821fe94b6f0486c728e3a1e966f269 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 2/2] Revert "Add betterbug mk to zumapro" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8d27b29ae1c4603700a7b2a2891438a1f2e1ba9d) Merged-In: I77595ebfa5c9bb7b8673dd132e7021fb0ed7e7ad Change-Id: I77595ebfa5c9bb7b8673dd132e7021fb0ed7e7ad --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index a8a35a3..90d0470 100644 --- a/device.mk +++ b/device.mk @@ -41,7 +41,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 include device/google/zumapro/dumpstate/item.mk