Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 391624d5 authored by Justin Lannin's avatar Justin Lannin
Browse files

DefaultPermissionGrantPolicy: Check feature flag when parsing permissions. 

This ensures that we can add new pre-granted permissions to the list in a way that is flag protected.

Test: Verified that pre-granted permission reflected flag value. More details in https://docs.google.com/document/d/19Yg1s1dRahnSfiRMqDukcT4XD3fD8tVZCdSRaVyKlyY/edit?tab=t.1cxhi22djihy
Bug: 377545213
Flag: EXEMPT Adding support for permissions to be added by flag.
Change-Id: I111c5a38b1692ce3d10ebc3e879b6f5c92f6f50d
parent 90d18bad

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+9 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import android.util.SparseArray; 
import android.util.Xml;



import com.android.internal.R;

import com.android.internal.pm.pkg.parsing.ParsingPackageUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.XmlUtils;

import com.android.modules.utils.TypedXmlPullParser;
@@ -1632,6 +1633,14 @@ final class DefaultPermissionGrantPolicy { 
                    continue;

                }



                // If the trunkstable feature flag is disabled for this

                // exception, skip the tag.

                if (ParsingPackageUtils.getAconfigFlags().skipCurrentElement(

                        /* pkg= */ null, parser, /* allowNoNamespace= */ true)) {

                    XmlUtils.skipCurrentTag(parser);

                    continue;

                }



                final boolean fixed =

                        parser.getAttributeBoolean(null, ATTR_FIXED, false);

                final boolean whitelisted =