From 42ab8a3cd02dff65511e78576d5199b1e06a4151 Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Thu, 11 Jul 2019 12:09:56 +0200
Subject: [PATCH] miatoll: import Hotword Enrollment blobs [2/2]

Change-Id: I4ca4475ac82d6755c4a6b708c1317ab02e42887a
---
 configs/hotword-hiddenapi-package-whitelist.xml |  8 ++++++++
 configs/privapp-permissions-hotword.xml         | 10 ++++++++++
 device.mk                                       |  5 +++++
 proprietary-files.txt                           |  4 ++++
 4 files changed, 27 insertions(+)
 create mode 100644 configs/hotword-hiddenapi-package-whitelist.xml
 create mode 100644 configs/privapp-permissions-hotword.xml

diff --git a/configs/hotword-hiddenapi-package-whitelist.xml b/configs/hotword-hiddenapi-package-whitelist.xml
new file mode 100644
index 0000000..4fdfb0a
--- /dev/null
+++ b/configs/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-permissions-hotword.xml b/configs/privapp-permissions-hotword.xml
new file mode 100644
index 0000000..3f2f2af
--- /dev/null
+++ b/configs/privapp-permissions-hotword.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.android.hotwordenrollment.okgoogle">
+        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.hotwordenrollment.xgoogle">
+        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    </privapp-permissions>
+</permissions>
diff --git a/device.mk b/device.mk
index a267449..c828c35 100644
--- a/device.mk
+++ b/device.mk
@@ -195,6 +195,11 @@ PRODUCT_PACKAGES += \
     libhwbinder \
     libhwbinder.vendor
 
+# Hotword Enrollement
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/hotword-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hotword-hiddenapi-package-whitelist.xml \
+    $(LOCAL_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml
+
 # Init scripts
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/etc/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.qcom.rc \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index cf76cbc..643344b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -823,6 +823,10 @@ vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so
 vendor/lib/libqsap_sdk.so
 vendor/lib64/libqsap_sdk.so
 
+# HotwordEnrollment
+-product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk;PRESIGNED
+
 # IMS
 -system_ext/app/uceShimService/uceShimService.apk
 system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml