From 0a255879586b7f57cba58befd48cd522a460769d Mon Sep 17 00:00:00 2001
From: ReallySnow <reallysnow233@gmail.com>
Date: Fri, 14 Jan 2022 19:29:06 +0800
Subject: [PATCH] google_pixel: 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
* Partially extracted from: SP1A.210812.016.A2

Change-Id: I446ae5d243cff134901094f82c90a0bbf3bb4381
---
 apps/GoogleApps.mk                |  4 ++++
 apps/sysconfig/aiai_allowlist.xml | 32 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 apps/sysconfig/aiai_allowlist.xml

diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index 3e730cd..28e58d3 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -25,6 +25,10 @@ ifeq ($(filter $(PIXEL_CODENAMES),$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
     DeviceIntelligenceNetworkPrebuilt2021 \
     DevicePersonalizationPrebuiltPixel2021
+
+# AiAi Allowlist
+PRODUCT_COPY_FILES += \
+    vendor/google_pixel/apps/sysconfig/aiai_allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/aiai_allowlist.xml
 endif
 
 ## Core packages
diff --git a/apps/sysconfig/aiai_allowlist.xml b/apps/sysconfig/aiai_allowlist.xml
new file mode 100644
index 0000000..9767e87
--- /dev/null
+++ b/apps/sysconfig/aiai_allowlist.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source 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.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" />
+    <allow-association target="com.google.android.as" allowed="com.google.android.providers.media.module" />
+
+    <!-- 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>