From c2a541d85faac9cdc8316434dcd1ddea4e9a2478 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Thu, 29 Feb 2024 18:54:43 +0000 Subject: Allowlist for platform signed package/sharedUid-s. Fixes: 308573259 Test: atest android.content.pm.cts.PackageManagerTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4f882ccfbf955b5fc9e04ef45ff3293885a7d20a) Merged-In: Ieb9e256b5fbb3b2ccd5d6a695f63011a31e95d9b Change-Id: Ieb9e256b5fbb3b2ccd5d6a695f63011a31e95d9b 24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev. --- data/etc/Android.bp | 6 ++++++ data/etc/CleanSpec.mk | 2 ++ data/etc/package-shareduid-allowlist.xml | 35 ++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 data/etc/package-shareduid-allowlist.xml (limited to 'data') diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 238a3e10f058..1410950966e9 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -72,6 +72,12 @@ prebuilt_etc { src: "enhanced-confirmation.xml", } +prebuilt_etc { + name: "package-shareduid-allowlist.xml", + sub_dir: "sysconfig", + src: "package-shareduid-allowlist.xml", +} + // Privapp permission whitelist files prebuilt_etc { diff --git a/data/etc/CleanSpec.mk b/data/etc/CleanSpec.mk index 783a7edadeb7..fd38d2782cb2 100644 --- a/data/etc/CleanSpec.mk +++ b/data/etc/CleanSpec.mk @@ -43,6 +43,8 @@ #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/sysconfig/package-shareduid-allowlist.xml) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/sysconfig/package-shareduid-allowlist.xml) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.carrierconfig.xml) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/etc/permissions/com.android.carrierconfig.xml) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/etc/permissions/com.android.emergency.xml) diff --git a/data/etc/package-shareduid-allowlist.xml b/data/etc/package-shareduid-allowlist.xml new file mode 100644 index 000000000000..2401d4a26e68 --- /dev/null +++ b/data/etc/package-shareduid-allowlist.xml @@ -0,0 +1,35 @@ + + + + + + + + -- cgit v1.2.3-59-g8ed1b