commit 8f3f4816ea23ec0a19bd20fca3aa689b9d24382a
author Joe Onorato <joeo@google.com> Mon Mar 25 14:16:28 2019 -0700
committer Joe Onorato <joeo@google.com> Tue Mar 26 21:29:09 2019 -0700
tree cca1232182a1004c02b48e1b157e7eb2062fc4e4
parent 1c33a647055210e250606c145b2fe97d5bd4cdba

Fix api council feedback

Bug: 126700270
Test: treehugger
Change-Id: Ib274c7c7975b6260b018d63216e03fd8eff57223

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 1d3118a..d2c5844 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1600,7 +1600,7 @@
     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

diff --git a/api/test-current.txt b/api/test-current.txt
index 56c5e98..6f8f310 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -662,7 +662,7 @@
   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

diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 961faa0c..b190b34 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -6916,6 +6916,7 @@
      */
     @SystemApi
     @TestApi
+    @Nullable
     public String getIncidentReportApproverPackageName() {
         throw new UnsupportedOperationException(
                 "getIncidentReportApproverPackageName not implemented in subclass");