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

Commit 5f303659 authored by Varun Shah's avatar Varun Shah
Browse files

Added a new "wellbeing" protection flag. 

Permissions that have the new wellbeing protection flag will be granted
to the wellbeing app, as defined by the OEM in the system resource.

The ACCESS_INSTANT_APPS permission is updated to use the wellbeing
flag. The SUSPEND_APPS permission will also follow the same model now.

Bug: 119330345
Test: atest CtsPermission2TestCases:PermissionPolicyTest
Test: atest com.android.server.pm.SuspendPackagesTest
Test: atest com.google.android.suspendapps.permissionpolicy.gts.SuspendAppsPermissionPolicyTest
Change-Id: Iffedc7704824292be48a4ef198fff97c1e5c39da
parent c90e979d

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ package android { 
    field public static final java.lang.String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";

    field public static final java.lang.String ACCESS_DRM_CERTIFICATES = "android.permission.ACCESS_DRM_CERTIFICATES";

    field public static final deprecated java.lang.String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";

    field public static final java.lang.String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS";

    field public static final java.lang.String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";

    field public static final java.lang.String ACCESS_MTP = "android.permission.ACCESS_MTP";

    field public static final java.lang.String ACCESS_NETWORK_CONDITIONS = "android.permission.ACCESS_NETWORK_CONDITIONS";
@@ -1246,6 +1247,7 @@ package android.content.pm { 
    method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);

    method public abstract int getIntentVerificationStatusAsUser(java.lang.String, int);

    method public abstract int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);

    method public java.lang.String getWellbeingPackageName();

    method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);

    method public abstract int installExistingPackage(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract int installExistingPackage(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -1348,6 +1350,7 @@ package android.content.pm { 
    field public static final int FLAG_REMOVED = 2; // 0x2

    field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000

    field public java.lang.String backgroundPermission;

    field public int requestRes;

  }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ package android.content.pm { 
  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

    field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000

    field public java.lang.String backgroundPermission;

  }

core/java/android/app/ApplicationPackageManager.java

+9 −0
Original line number Diff line number Diff line
@@ -2973,6 +2973,15 @@ public class ApplicationPackageManager extends PackageManager { 
        }

    }



    @Override

    public String getWellbeingPackageName() {

        try {

            return mPM.getWellbeingPackageName();

        } catch (RemoteException e) {

            throw e.rethrowAsRuntimeException();

        }

    }



    @Override

    public boolean isPackageStateProtected(String packageName, int userId) {

        try {

core/java/android/content/pm/IPackageManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -675,6 +675,8 @@ interface IPackageManager { 


    String getSystemTextClassifierPackageName();



    String getWellbeingPackageName();



    boolean isPackageStateProtected(String packageName, int userId);



    void sendDeviceCustomizationReadyBroadcast();

core/java/android/content/pm/PackageManager.java

+11 −0
Original line number Diff line number Diff line
@@ -6423,6 +6423,17 @@ public abstract class PackageManager { 
                "getSystemTextClassifierPackageName not implemented in subclass");

    }



    /**

     * @return the wellbeing app package name, or null if it's not defined by the OEM.

     *

     * @hide

     */

    @SystemApi

    public String getWellbeingPackageName() {

        throw new UnsupportedOperationException(

                "getWellbeingPackageName not implemented in subclass");

    }



    /**

     * @return whether a given package's state is protected, e.g. package cannot be disabled,

     *         suspended, hidden or force stopped.