From f77adb24dd3bb676a6b5a1431273fa89b2d88fb1 Mon Sep 17 00:00:00 2001
From: Chenyang Zhong <zhongcy95@gmail.com>
Date: Sun, 7 Feb 2021 06:31:02 +0600
Subject: [PATCH] sdm660-common: import Hotword Enrollment blobs

Co-authored-by: IMMANUEL44 <immanuelr44@gmail.com>
---
 .../hotword-hiddenapi-package-whitelist.xml               | 8 ++++++++
 .../privapp-permission/privapp-permissions-qti-system.xml | 5 +++++
 configs/qti_whitelist.xml                                 | 2 ++
 proprietary-files.txt                                     | 6 ++++++
 sdm660.mk                                                 | 5 +++--
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100755 configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml

diff --git a/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml b/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml
new file mode 100755
index 00000000..4fdfb0a7
--- /dev/null
+++ b/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This XML file declares which platform apps that need to access internal APIs.
+-->
+<config>
+  <hidden-api-whitelisted-app package="com.android.hotwordenrollment.okgoogle" />
+  <hidden-api-whitelisted-app package="com.android.hotwordenrollment.xgoogle" />
+</config>
diff --git a/configs/privapp-permission/privapp-permissions-qti-system.xml b/configs/privapp-permission/privapp-permissions-qti-system.xml
index b5f9dea8..716d4d19 100644
--- a/configs/privapp-permission/privapp-permissions-qti-system.xml
+++ b/configs/privapp-permission/privapp-permissions-qti-system.xml
@@ -180,4 +180,9 @@ It allows additional grants on top of privapp-permissions-platform.xml
       <permission name="android.permission.INTERACT_ACROSS_USERS" />
       <permission name="android.permission.READ_FRAME_BUFFER"/>
     </privapp-permissions>
+    
+    <privapp-permissions package="com.android.hotwordenrollment.common.util">
+      <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+      <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
+    </privapp-permissions>
 </permissions>
diff --git a/configs/qti_whitelist.xml b/configs/qti_whitelist.xml
index 825e0e11..368975b0 100755
--- a/configs/qti_whitelist.xml
+++ b/configs/qti_whitelist.xml
@@ -32,6 +32,7 @@
 
 <config>
     <!-- These are telephony components that need to freely run in the background -->
+    <allow-in-power-save package="com.android.hotwordenrollment.common.util" />
     <allow-in-power-save package="com.qualcomm.atfwd" />
     <allow-in-power-save package="com.qualcomm.qti.telephonyservice" />
     <allow-in-power-save package="com.qualcomm.qcrilmsgtunnel" />
@@ -51,6 +52,7 @@
     <allow-in-power-save package="com.skyhook.blp" />
     <allow-in-power-save package="org.lineageos.settings.device" />
     <!-- These telephony applications need access to non-[System]SDK APIs -->
+    <hidden-api-whitelisted-app package="com.android.hotwordenrollment.common.util" />
     <hidden-api-whitelisted-app package="com.qualcomm.uimremoteserver" />
     <hidden-api-whitelisted-app package="com.qualcomm.uimremoteclient" />
     <hidden-api-whitelisted-app package="com.qualcomm.atfwd" />
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4d955a73..ffd5ab91 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -398,6 +398,12 @@ vendor/lib64/libtinyxml2_1.so|70942325afdd14eedcf11b3fbbfbc3d98f42f8dc
 vendor/lib/hw/vulkan.sdm660.so|976dc51608ebdbed8ced26809e3b776c47695c39
 vendor/lib64/hw/vulkan.sdm660.so|0b282ec0dc482134fd0ba168cd367a8a008ceb5f
 
+# HotwordEnrollment
+-product/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk|1cbc6ae6490cfc6e16619773809b9afcc9998f91;PRESIGNED
+-product/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk|24b4885a1f9194c65f378a2afd8e08b4b11842d8;PRESIGNED
+-system_ext/framework/com.android.hotwordenrollment.common.util.jar|bef92589e75a6da6043f85f4b9b0e85866429624
+system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml|563a58554d9c0dd0608552b644fbf74519a447bb
+
 # IRQ balance - from LA.UM.8.2.r1-07400-sdm660.0
 vendor/bin/msm_irqbalance|0e967f5c7eaf8d863a50996459101be47adf96a2
 
diff --git a/sdm660.mk b/sdm660.mk
index 13008c78..6deb98a0 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -445,9 +445,10 @@ PRODUCT_PACKAGES += \
 
 # Privapp-Permissions
 PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hotword-hiddenapi-package-whitelist.xml \
+    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml \
     $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system-ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml \
-    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
-    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml
+    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml
 
 # Public Libraries
 PRODUCT_COPY_FILES += \