From 9098b8634e8f91b4f1f81870d5bc8deb3f3cf0ee Mon Sep 17 00:00:00 2001
From: ReallySnow <reallysnow233@gmail.com>
Date: Mon, 28 Feb 2022 08:31:54 +0000
Subject: [PATCH] sunfish: Add AiAi allowlist

* In Android 12, Android System Intelligence (com.google.android.as) uses
  some of the Private Compute Service (com.google.android.as.oss) services.
  The absence of these Allowlists will cause Android System Intelligence
  to fail to connect to the network and cause collapse.
* We don't need to extract google.xml to fix it, just extract the AiAi part
* Also import Private Compute Service

Change-Id: I446ae5d243cff134901094f82c90a0bbf3bb4381
---
 allowlist_com.google.android.as.xml | 31 +++++++++++++++++++++++++++++
 device-lineage.mk                   |  4 ++++
 proprietary-files.txt               |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 allowlist_com.google.android.as.xml

diff --git a/allowlist_com.google.android.as.xml b/allowlist_com.google.android.as.xml
new file mode 100644
index 00000000..11e6e8d2
--- /dev/null
+++ b/allowlist_com.google.android.as.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<config>
+    <!-- Specify the explicit set of other applications that AI services are allowed to
+         interact with, including the providers that back the implementation of the APIs
+         provided by the package. -->
+    <allow-association target="com.google.android.as" allowed="com.android.bluetooth" />
+    <allow-association target="com.google.android.as" allowed="com.android.bluetooth.services" />
+    <allow-association target="com.google.android.as" allowed="com.android.providers.contacts" />
+    <allow-association target="com.google.android.as" allowed="com.android.providers.media" />
+    <allow-association target="com.google.android.as" allowed="com.android.providers.telephony" />
+    <allow-association target="com.google.android.as" allowed="com.android.systemui" />
+    <!-- AI services can bind to its open-source network component. -->
+    <allow-association target="com.google.android.as" allowed="com.google.android.as.oss" />
+
+    <!-- AI services open-source network component can only bind back to the core package. -->
+    <allow-association target="com.google.android.as.oss" allowed="com.google.android.as" />
+</config>
diff --git a/device-lineage.mk b/device-lineage.mk
index 3bac3550..c17bdf3e 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -12,6 +12,10 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/qcom/opensource/commonsys-intf/display \
     vendor/qcom/opensource/display
 
+# AiAi Config
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/allowlist_com.google.android.as.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/allowlist_com.google.android.as.xml
+
 # Camera
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.vendor.camera.extensions.package=com.google.android.apps.camera.services \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 6d990a88..ed3b80ac 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -3,6 +3,7 @@
 # product partition
 
 # AiAi
+product/priv-app/DeviceIntelligenceNetworkPrebuilt/DeviceIntelligenceNetworkPrebuilt.apk;PRESIGNED
 product/priv-app/DevicePersonalizationPrebuiltPixel4/DevicePersonalizationPrebuiltPixel4.apk;PRESIGNED
 
 # Audio