From 8f3f4816ea23ec0a19bd20fca3aa689b9d24382a Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Mon, 25 Mar 2019 14:16:28 -0700 Subject: [PATCH] Fix api council feedback Bug: 126700270 Test: treehugger Change-Id: Ib274c7c7975b6260b018d63216e03fd8eff57223 --- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/content/pm/PackageManager.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 1d3118a81c65d..d2c5844db0b72 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1600,7 +1600,7 @@ package android.content.pm { method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_SHARED_LIBRARIES) public java.util.List 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 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(); diff --git a/api/test-current.txt b/api/test-current.txt index 56c5e989f7379..6f8f310f6a2c8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 getInstalledApplicationsAsUser(int, int); method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS_FULL") public abstract java.util.List getInstalledPackagesAsUser(int, int); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 961faa0c19b66..b190b34aa03fd 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -6916,6 +6916,7 @@ public abstract class PackageManager { */ @SystemApi @TestApi + @Nullable public String getIncidentReportApproverPackageName() { throw new UnsupportedOperationException( "getIncidentReportApproverPackageName not implemented in subclass");