Merge TQ2A.230405.003
Bug: 271343657
Merged-In: I7ab4f168a95f75760d12aa349ee1d98837cbf80a
Change-Id: I9c04d414f0e78f76c16f8a8166871ec1f0360a3f
diff --git a/aosp_cheetah.mk b/aosp_cheetah.mk
index b81dfd6..8f44682 100644
--- a/aosp_cheetah.mk
+++ b/aosp_cheetah.mk
@@ -30,3 +30,5 @@
DEVICE_MANIFEST_FILE := \
device/google/pantah/manifest.xml
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/aosp_panther.mk b/aosp_panther.mk
index a4b5617..36a4cb1 100644
--- a/aosp_panther.mk
+++ b/aosp_panther.mk
@@ -30,3 +30,5 @@
DEVICE_MANIFEST_FILE := \
device/google/pantah/manifest.xml
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 03327e3..e81d196 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -348,6 +348,11 @@
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true
+# RKPD
+PRODUCT_PRODUCT_PROPERTIES += \
+ remote_provisioning.enable_rkpd=true \
+ remote_provisioning.hostname=remoteprovisioning.googleapis.com \
+
##Audio Vendor property
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false
diff --git a/device-panther.mk b/device-panther.mk
index 55dc3d6..137739d 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -332,6 +332,11 @@
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true
+# RKPD
+PRODUCT_PRODUCT_PROPERTIES += \
+ remote_provisioning.enable_rkpd=true \
+ remote_provisioning.hostname=remoteprovisioning.googleapis.com \
+
##Audio Vendor property
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false
diff --git a/self-extractors_cheetah/extract-lists.txt b/self-extractors_cheetah/extract-lists.txt
index e09731b..255e82e 100644
--- a/self-extractors_cheetah/extract-lists.txt
+++ b/self-extractors_cheetah/extract-lists.txt
@@ -7,10 +7,12 @@
RADIO/radio.img \
system_ext/etc/permissions/com.shannon.imsservice.xml \
system_ext/etc/permissions/com.shannon.rcsservice.xml \
+ system_ext/etc/permissions/privapp-permissions-qorvo.xml \
system_ext/lib64/libmediaadaptor.so \
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
system_ext/priv-app/ShannonIms/ShannonIms.apk \
system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.apk \
+ system_ext/priv-app/UwbVendorService/UwbVendorService.apk \
"
;;
diff --git a/self-extractors_cheetah/google_devices/staging/Android.mk b/self-extractors_cheetah/google_devices/staging/Android.mk
index 30e6278..6e1e67e 100644
--- a/self-extractors_cheetah/google_devices/staging/Android.mk
+++ b/self-extractors_cheetah/google_devices/staging/Android.mk
@@ -70,4 +70,20 @@
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := UwbVendorService
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_OWNER := qorvo
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
+include $(BUILD_PREBUILT)
+
endif
diff --git a/self-extractors_cheetah/google_devices/staging/device-partial.mk b/self-extractors_cheetah/google_devices/staging/device-partial.mk
index f8bba00..c7a502d 100644
--- a/self-extractors_cheetah/google_devices/staging/device-partial.mk
+++ b/self-extractors_cheetah/google_devices/staging/device-partial.mk
@@ -20,6 +20,7 @@
QualifiedNetworksService \
ShannonIms \
ShannonRcs \
+ UwbVendorService \
PRODUCT_PACKAGES += \
libmediaadaptor \
@@ -28,4 +29,5 @@
PRODUCT_COPY_FILES := \
vendor/google_devices/cheetah/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
vendor/google_devices/cheetah/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
+ vendor/google_devices/cheetah/proprietary/privapp-permissions-qorvo.xml:system_ext/etc/permissions/privapp-permissions-qorvo.xml:qorvo \
