From c8f51a5d21c1bb255d5fb22ffe043e1f7b25d37f Mon Sep 17 00:00:00 2001
From: Sumedh Sen <sumedhsen@google.com>
Date: Wed, 18 Jan 2023 14:56:31 -0800
Subject: [PATCH] Rename APIs per API Council review

Renamed getInstallInfo to readInstallInfo
Renamed getIsPreApprovalRequested to isPreApprovalRequested

Bug: 265793251
Test: atest CtsPackageInstallTestCases:InstallInfoTest

Change-Id: I0ac9314fa8d174e4e04e56574eebea965e9b2e74
---
 core/api/current.txt                               | 2 +-
 core/api/system-current.txt                        | 2 +-
 core/java/android/content/pm/PackageInstaller.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 53890eb5539df..624846fec08f0 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -12187,7 +12187,6 @@ package android.content.pm {
     method @Nullable public String getInstallerAttributionTag();
     method @Nullable public String getInstallerPackageName();
     method public int getInstallerUid();
-    method @NonNull public boolean getIsPreApprovalRequested();
     method public int getMode();
     method public int getOriginatingUid();
     method @Nullable public android.net.Uri getOriginatingUri();
@@ -12207,6 +12206,7 @@ package android.content.pm {
     method public boolean isApplicationEnabledSettingPersistent();
     method public boolean isCommitted();
     method public boolean isMultiPackage();
+    method public boolean isPreApprovalRequested();
     method public boolean isRequestUpdateOwnership();
     method public boolean isSealed();
     method public boolean isStaged();
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index a40d97e9525c6..531db0d8ef146 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -3590,7 +3590,7 @@ package android.content.pm {
   }
 
   public class PackageInstaller {
-    method @NonNull public android.content.pm.PackageInstaller.InstallInfo getInstallInfo(@NonNull java.io.File, int) throws android.content.pm.PackageInstaller.PackageParsingException;
+    method @NonNull public android.content.pm.PackageInstaller.InstallInfo readInstallInfo(@NonNull java.io.File, int) throws android.content.pm.PackageInstaller.PackageParsingException;
     method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean);
     field public static final String ACTION_CONFIRM_INSTALL = "android.content.pm.action.CONFIRM_INSTALL";
     field public static final String ACTION_CONFIRM_PRE_APPROVAL = "android.content.pm.action.CONFIRM_PRE_APPROVAL";
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index 0b74dd1a267c7..b84232f07a871 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -2042,7 +2042,7 @@ public class PackageInstaller {
      */
     @SystemApi
     @NonNull
-    public InstallInfo getInstallInfo(@NonNull File file, int flags)
+    public InstallInfo readInstallInfo(@NonNull File file, int flags)
             throws PackageParsingException {
         final ParseTypeImpl input = ParseTypeImpl.forDefaultParsing();
         final ParseResult<PackageLite> result = ApkLiteParseUtils.parsePackageLite(
@@ -3740,7 +3740,7 @@ public class PackageInstaller {
         /**
          * Returns whether this session has requested user pre-approval.
          */
-        public @NonNull boolean getIsPreApprovalRequested() {
+        public boolean isPreApprovalRequested() {
             return isPreapprovalRequested;
         }