From 5b9f6a592c5898f7b53b8550780caa2a2002922c Mon Sep 17 00:00:00 2001 From: Jay Thomas Sullivan Date: Tue, 29 Mar 2022 10:45:07 -0700 Subject: [PATCH] Add perm split W_E_S to A_M_L and sort Add a permission split: WRITE_EXTERNAL_STORAGE to ACCESS_MEDIA_LOCATION ...and sort split permissions. The reason adding this is that the split-permission handling code doesn't handle recursive split-permission mappings, but only direct mappings. The reason for sorting is that, given a tree of permission splits, the entries in platform.xml must be sorted topologically, due to current permission split code. Bug: 227240947 Test: atest CtsPermissionTestCases CtsPermission3TestCases SplitPermissionsSystemTest Change-Id: I62c2ab8687af2e8325fcc370a74af0f589d8e9f2 --- data/etc/platform.xml | 60 +++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/data/etc/platform.xml b/data/etc/platform.xml index a02ac6c39e93..61bb1ee2561f 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -223,14 +223,42 @@ targetSdk="29"> + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -255,30 +283,6 @@ targetSdk="33"> - - - - - - - - - - - - - - - - - -