From c3b116eb8c3f3803cf6c79c5aa58305075ce3a1d Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Tue, 8 Nov 2022 18:48:31 -0500
Subject: [PATCH] google_pixel: Copy preinstalled packages sysconfig

---
 apps/GoogleApps.mk                            |  3 ++-
 ...-packages-product-pixel-2017-and-newer.xml | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml

diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index a398caa..7b3c1da 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -32,7 +32,8 @@ endif
 
 # AiAi Allowlist
 PRODUCT_COPY_FILES += \
-    vendor/google_pixel/apps/sysconfig/aiai_allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/aiai_allowlist.xml
+    vendor/google_pixel/apps/sysconfig/aiai_allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/aiai_allowlist.xml \
+    vendor/google_pixel/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
 
 ## Core packages
 PRODUCT_PACKAGES += \
diff --git a/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml b/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
new file mode 100644
index 0000000..ef1bdea
--- /dev/null
+++ b/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- System packages to preinstall on Pixel 2017-and-newer devices, per user type.
+     Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
+-->
+<config>
+    <install-in-user-type package="com.android.wallpaper.livepicker">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+    <install-in-user-type package="com.google.android.apps.nexuslauncher">
+        <!-- Unfortunately some things (eg recents) look specifically for launcher in user 0 -->
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+    <install-in-user-type package="com.google.android.apps.wallpaper">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+    <install-in-user-type package="com.google.android.apps.wallpaper.nexus">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+    <install-in-user-type package="com.google.android.calculator">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+    <install-in-user-type package="com.google.android.deskclock">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+</config>