Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
Merged-In: I67ba436cb695e452299537a0ccdf412a2c045978
Merged-In: I4d1b482613fc45e4003fa9bdfff21b433daf8376
Merged-In: Icaa4fabfd5b043da0b39e070b038302d116e5d06
Change-Id: Id2a50d0853935b2b722439da5803c696ef9c2cd1
diff --git a/aosp_oriole.mk b/aosp_oriole.mk
index fea2be8..113f679 100644
--- a/aosp_oriole.mk
+++ b/aosp_oriole.mk
@@ -22,3 +22,5 @@
PRODUCT_MODEL := AOSP on Oriole
PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/aosp_raven.mk b/aosp_raven.mk
index 0a8f525..6a29283 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -18,7 +18,12 @@
$(call inherit-product, device/google/raviole/device-raven.mk)
PRODUCT_NAME := aosp_raven
+PRODUCT_NAME_FOR_ATTESTATION := raven
PRODUCT_DEVICE := raven
PRODUCT_MODEL := AOSP on Raven
+PRODUCT_MODEL_FOR_ATTESTATION := Pixel 6 Pro
PRODUCT_BRAND := Android
+PRODUCT_BRAND_FOR_ATTESTATION := google
PRODUCT_MANUFACTURER := Google
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/device-oriole.mk b/device-oriole.mk
index 0c8e3f8..b4a772c 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -227,6 +227,11 @@
PRODUCT_PRODUCT_PROPERTIES += \
vendor.audio.hapticgenerator.distortion.output.gain=0.5
+# RKPD
+PRODUCT_PRODUCT_PROPERTIES += \
+ remote_provisioning.enable_rkpd=true \
+ remote_provisioning.hostname=remoteprovisioning.googleapis.com \
+
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g
diff --git a/device-raven.mk b/device-raven.mk
index d0dc3b5..e0b16f3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -240,6 +240,11 @@
PRODUCT_PRODUCT_PROPERTIES += \
vendor.audio.hapticgenerator.distortion.output.gain=0.5
+# RKPD
+PRODUCT_PRODUCT_PROPERTIES += \
+ remote_provisioning.enable_rkpd=true \
+ remote_provisioning.hostname=remoteprovisioning.googleapis.com \
+
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g
diff --git a/self-extractors_raven/extract-lists.txt b/self-extractors_raven/extract-lists.txt
index 0226644..ea7a5a9 100644
--- a/self-extractors_raven/extract-lists.txt
+++ b/self-extractors_raven/extract-lists.txt
@@ -8,12 +8,14 @@
system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml \
system_ext/etc/permissions/com.shannon.rcsservice.xml \
system_ext/etc/permissions/oemrilhook.xml \
+ system_ext/etc/permissions/privapp-permissions-qorvo.xml \
system_ext/framework/oemrilhook.jar \
system_ext/lib64/libmediaadaptor.so \
system_ext/lib/libmediaadaptor.so \
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
system_ext/priv-app/ShannonIms/ShannonIms.apk \
system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
+ system_ext/priv-app/UwbVendorService/UwbVendorService.apk \
"
;;
diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk
index 54f01eb..f3ad011 100644
--- a/self-extractors_raven/google_devices/staging/Android.mk
+++ b/self-extractors_raven/google_devices/staging/Android.mk
@@ -78,4 +78,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_raven/google_devices/staging/device-partial.mk b/self-extractors_raven/google_devices/staging/device-partial.mk
index 33cd4db..9f6324f 100644
--- a/self-extractors_raven/google_devices/staging/device-partial.mk
+++ b/self-extractors_raven/google_devices/staging/device-partial.mk
@@ -20,6 +20,7 @@
ShannonQualifiedNetworksService \
ShannonIms \
ShannonRcs \
+ UwbVendorService \
PRODUCT_PACKAGES += \
libmediaadaptor \
@@ -30,5 +31,6 @@
vendor/google_devices/raven/proprietary/com.shannon.qualifiednetworksservice.xml:system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml:samsung \
vendor/google_devices/raven/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
vendor/google_devices/raven/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \
+ vendor/google_devices/raven/proprietary/privapp-permissions-qorvo.xml:system_ext/etc/permissions/privapp-permissions-qorvo.xml:qorvo \
vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \