Move privapp-permissions-goldfish.xml to system
Also adding the missing MANAGE_USERS permission.
Bug: 110517983
Bug: 111963599
Test: boot GSI
Change-Id: I5f2426c819084efac59c1dd76ee9f62a183cc8b2
Merged-In: I5f2426c819084efac59c1dd76ee9f62a183cc8b2
(cherry picked from commit d89226a588a45df7d5aa0ce617ea728c816696a5)
diff --git a/data/etc/permissions/privapp-permissions-goldfish.xml b/data/etc/permissions/privapp-permissions-goldfish.xml
index 7124fb8..8f9643b 100644
--- a/data/etc/permissions/privapp-permissions-goldfish.xml
+++ b/data/etc/permissions/privapp-permissions-goldfish.xml
@@ -24,9 +24,10 @@
<permissions>
<privapp-permissions package="com.android.sdksetup">
<permission name="android.permission.BACKUP"/>
+ <permission name="android.permission.MANAGE_USERS"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
</privapp-permissions>
<privapp-permissions package="com.android.dialer">
<permission name="android.permission.STATUS_BAR"/>
</privapp-permissions>
-</permissions>
\ No newline at end of file
+</permissions>
diff --git a/vendor.mk b/vendor.mk
index 958b309..e1d4dbb 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -124,6 +124,10 @@
ipv6proxy \
wpa_supplicant \
+# Needed for /system/priv-app/SdkSetup/SdkSetup.apk to pass CTS android.permission2.cts.PrivappPermissionsTest.
+PRODUCT_COPY_FILES += \
+ device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml
+
PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/apns-conf.xml:data/misc/apns/apns-conf.xml \
device/generic/goldfish/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \
@@ -134,7 +138,6 @@
device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
device/generic/goldfish/input/goldfish_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/goldfish_rotary.idc \
device/generic/goldfish/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
- device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-goldfish.xml \
device/generic/goldfish/data/etc/config.ini:config.ini \
device/generic/goldfish/wifi/simulated_hostapd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/simulated_hostapd.conf \
device/generic/goldfish/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
