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

Commit cc9fbce7 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

Fix merge conflicts between AOSP, pi-dev. 

Due to changes between AOSP & internal master, the merge to these two
changes caused duplicated code:
 Ieb4bd9cc439c6a5b8fb9424d8902d8b46aec309f
 Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59

Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Bug: 76450910
Test: m
Change-Id: I46130cfd82288a564f681e305e2060286b026bcf
parent b63f23a0

core/java/android/content/pm/ApplicationInfo.java

+0 −27
Original line number Diff line number Diff line
@@ -1702,33 +1702,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        }

    }



    private boolean isPackageWhitelistedForHiddenApis() {

        return SystemConfig.getInstance().getHiddenApiWhitelistedApps().contains(packageName);

    }



    /**

     * @hide

     */

    public @HiddenApiEnforcementPolicy int getHiddenApiEnforcementPolicy() {

        if (mHiddenApiPolicy != HIDDEN_API_ENFORCEMENT_DEFAULT) {

            return mHiddenApiPolicy;

        }

        if (isPackageWhitelistedForHiddenApis() && (isSystemApp() || isUpdatedSystemApp())) {

            return HIDDEN_API_ENFORCEMENT_NONE;

        }

        return HIDDEN_API_ENFORCEMENT_BLACK;

    }



    /**

     * @hide

     */

    public void setHiddenApiEnforcementPolicy(@HiddenApiEnforcementPolicy int policy) {

        if (!isValidHiddenApiEnforcementPolicy(policy)) {

            throw new IllegalArgumentException("Invalid API enforcement policy: " + policy);

        }

        mHiddenApiPolicy = policy;

    }



    /** @hide */

    public boolean isDefaultToDeviceProtectedStorage() {

        return (privateFlags