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

Commit 5a15b551 authored by Joe Onorato's avatar Joe Onorato
Browse files

Added a new "incidentReportApprover" permission protection flag. 

This gives the ONE app installed on the system the permission to
authorize the sharing of incident and bug reports with an app.

Currently that app is PermissionController.  Package Manager
enforces that there is only one installed, and refused to boot
if that isn't the case.

Bug: 123543706
Test: bit GooglePermissionControllerTest:*
Change-Id: I76a7fad0ea36359bbb0ff09669df46202d059dab
parent f5e95eff

api/system-current.txt

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

    field public static final String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK";

    field public static final String AMBIENT_WALLPAPER = "android.permission.AMBIENT_WALLPAPER";

    field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";

    field public static final String BACKUP = "android.permission.BACKUP";

    field public static final String BIND_ATTENTION_SERVICE = "android.permission.BIND_ATTENTION_SERVICE";

    field public static final String BIND_AUGMENTED_AUTOFILL_SERVICE = "android.permission.BIND_AUGMENTED_AUTOFILL_SERVICE";
@@ -1489,6 +1490,7 @@ package android.content.pm { 
    method @NonNull public android.content.pm.dex.ArtManager getArtManager();

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract String getDefaultBrowserPackageNameAsUser(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.SET_HARMFUL_APP_WARNINGS) public CharSequence getHarmfulAppWarning(@NonNull String);

    method public String getIncidentReportApproverPackageName();

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);

    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_INSTANT_APPS) public abstract android.graphics.drawable.Drawable getInstantAppIcon(String);

    method public abstract android.content.ComponentName getInstantAppInstallerComponent();
@@ -1610,6 +1612,7 @@ package android.content.pm { 
    field public static final int FLAG_REMOVED = 2; // 0x2

    field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000

    field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000

    field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000

    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

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ package android { 
  public static final class Manifest.permission {

    field public static final String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";

    field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";

    field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";

    field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";

    field public static final String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";

    field public static final String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";
@@ -413,6 +414,7 @@ package android.content.pm { 
  public abstract class PackageManager {

    method public abstract boolean arePermissionsIndividuallyControlled();

    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS_FULL") public abstract String getDefaultBrowserPackageNameAsUser(int);

    method public String getIncidentReportApproverPackageName();

    method public abstract int getInstallReason(String, @NonNull android.os.UserHandle);

    method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);

    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS_FULL") public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
@@ -434,6 +436,7 @@ package android.content.pm { 
  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000

    field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000

    field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000

    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_VENDOR_PRIVILEGED = 32768; // 0x8000

core/java/android/app/ApplicationPackageManager.java

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

    }



    @Override

    public String getIncidentReportApproverPackageName() {

        try {

            return mPM.getIncidentReportApproverPackageName();

        } 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
@@ -688,6 +688,8 @@ interface IPackageManager { 


    String getContentCaptureServicePackageName();



    String getIncidentReportApproverPackageName();



    boolean isPackageStateProtected(String packageName, int userId);



    void sendDeviceCustomizationReadyBroadcast();

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

+13 −0
Original line number Diff line number Diff line
@@ -6743,6 +6743,19 @@ public abstract class PackageManager { 
                "getContentCaptureServicePackageName not implemented in subclass");

    }



    /**

     * @return the incident report approver app package name, or null if it's not defined

     * by the OEM.

     *

     * @hide

     */

    @SystemApi

    @TestApi

    public String getIncidentReportApproverPackageName() {

        throw new UnsupportedOperationException(

                "getIncidentReportApproverPackageName not implemented in subclass");

    }



    /**

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

     *         suspended, hidden or force stopped.