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

Commit 917955a4 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes from topic "bug and incident report approval" 

* changes:
  Add IncidentCompanionService
  Added a new "incidentReportApprover" permission protection flag.
parents afe6ec4b e21ab7ea

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -656,6 +656,7 @@ java_defaults { 
        ":vold_aidl",

        ":installd_aidl",

        ":dumpstate_aidl",

        ":incidentcompanion_aidl",



        "lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl",

        "lowpan/java/android/net/lowpan/ILowpanNetScanCallback.aidl",
@@ -706,6 +707,7 @@ java_defaults { 
            "system/update_engine/binder_bindings",

            "frameworks/native/aidl/binder",

            "frameworks/native/cmds/dumpstate/binder",

            "frameworks/native/libs/incidentcompanion/binder",

            "frameworks/av/camera/aidl",

            "frameworks/av/media/libaudioclient/aidl",

            "frameworks/native/aidl/gui",

api/system-current.txt

+24 −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";
@@ -1306,6 +1307,7 @@ package android.content { 
    field public static final String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS";

    field @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public static final String ACTION_MANAGE_SPECIAL_APP_ACCESSES = "android.intent.action.MANAGE_SPECIAL_APP_ACCESSES";

    field public static final String ACTION_MASTER_CLEAR_NOTIFICATION = "android.intent.action.MASTER_CLEAR_NOTIFICATION";

    field public static final String ACTION_PENDING_INCIDENT_REPORTS_CHANGED = "android.intent.action.PENDING_INCIDENT_REPORTS_CHANGED";

    field public static final String ACTION_PRE_BOOT_COMPLETED = "android.intent.action.PRE_BOOT_COMPLETED";

    field public static final String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART";

    field public static final String ACTION_RESOLVE_INSTANT_APP_PACKAGE = "android.intent.action.RESOLVE_INSTANT_APP_PACKAGE";
@@ -1489,6 +1491,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 +1613,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
@@ -5330,7 +5334,27 @@ package android.os { 
  }















  public class IncidentManager {













    method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void approveReport(android.net.Uri);













    method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void cancelAuthorization(android.os.IncidentManager.AuthListener);













    method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void denyReport(android.net.Uri);













    method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public java.util.List<android.os.IncidentManager.PendingReport> getPendingReports();















    method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void reportIncident(android.os.IncidentReportArgs);













    method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener);













    field public static final int FLAG_CONFIRMATION_DIALOG = 1; // 0x1













  }

























  public static class IncidentManager.AuthListener {













    ctor public IncidentManager.AuthListener();













    method public void onReportApproved();













    method public void onReportDenied();













  }

























  public static class IncidentManager.PendingReport {













    ctor public IncidentManager.PendingReport(@NonNull android.net.Uri);













    method public int getFlags();













    method @NonNull public String getRequestingPackage();













    method public long getTimestamp();













    method @NonNull public android.net.Uri getUri();















  }





























  public final class IncidentReportArgs implements android.os.Parcelable {

































api/test-current.txt



+23
−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










@@ -1279,7 +1282,27 @@ package android.os {













  }































  public class IncidentManager {













    method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void approveReport(android.net.Uri);













    method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void cancelAuthorization(android.os.IncidentManager.AuthListener);













    method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public void denyReport(android.net.Uri);













    method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public java.util.List<android.os.IncidentManager.PendingReport> getPendingReports();















    method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void reportIncident(android.os.IncidentReportArgs);













    method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener);













    field public static final int FLAG_CONFIRMATION_DIALOG = 1; // 0x1













  }



























  public static class IncidentManager.AuthListener {













    ctor public IncidentManager.AuthListener();













    method public void onReportApproved();













    method public void onReportDenied();













  }



























  public static class IncidentManager.PendingReport {













    ctor public IncidentManager.PendingReport(@NonNull android.net.Uri);













    method public int getFlags();













    method @NonNull public String getRequestingPackage();













    method public long getTimestamp();













    method @NonNull public android.net.Uri getUri();















  }































  public final class IncidentReportArgs implements android.os.Parcelable {

































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/Context.java



+8
−0




























Original line number
Diff line number
Diff line








@@ -3180,6 +3180,7 @@ public abstract class Context {













            //@hide: CONTEXTHUB_SERVICE,















            SYSTEM_HEALTH_SERVICE,















            //@hide: INCIDENT_SERVICE,













            //@hide: INCIDENT_COMPANION_SERVICE,















            //@hide: STATS_COMPANION_SERVICE,















            COMPANION_DEVICE_SERVICE,















            CROSS_PROFILE_APPS_SERVICE,










@@ -4465,6 +4466,13 @@ public abstract class Context {













     */















    public static final String INCIDENT_SERVICE = "incident";





























    /**













     * Service to assist incidentd and dumpstated in reporting status to the user













     * and in confirming authorization to take an incident report or bugreport













     * @hide













     */













    public static final String INCIDENT_COMPANION_SERVICE = "incidentcompanion";





























    /**















     * Service to assist statsd in obtaining general stats.















     * @hide