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

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

Merge "Fix api council feedback"

parents 5e914573 8f3f4816

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1600,7 +1600,7 @@ package android.content.pm { 
    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_SHARED_LIBRARIES) public java.util.List<android.content.pm.SharedLibraryInfo> getDeclaredSharedLibraries(@NonNull String, int);

    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 @Nullable 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();

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,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 @Nullable 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);

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

+1 −0
Original line number Diff line number Diff line
@@ -6916,6 +6916,7 @@ public abstract class PackageManager { 
     */

    @SystemApi

    @TestApi

    @Nullable

    public String getIncidentReportApproverPackageName() {

        throw new UnsupportedOperationException(

                "getIncidentReportApproverPackageName not implemented in subclass");