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

Commit b6168cb1 authored by Songchun Fan's avatar Songchun Fan Committed by Android Build Coastguard Worker
Browse files

Revert "[ADI][24/N] rename APIs to final names" 

FLAG: EXEMPT just revert
BUG: 422535876
Test: n/a just revert

This reverts commit 21fca106.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d92c695e216f55e873692232f4a4e2af0549c4cd)
Merged-In: I99f9b9f13372b94df9062f07dd1792ecb5e66d45
Change-Id: I99f9b9f13372b94df9062f07dd1792ecb5e66d45
parent 387efcdd

core/api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -13239,10 +13239,10 @@ package android.content.pm { 
    method @Deprecated @Nullable public android.content.pm.PackageInstaller.SessionInfo getActiveStagedSession();

    method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getActiveStagedSessions();

    method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getAllSessions();

    method @FlaggedApi("android.content.pm.verification_service") @Nullable public final String getDeveloperVerificationServiceProvider();

    method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getMySessions();

    method @Nullable public android.content.pm.PackageInstaller.SessionInfo getSessionInfo(int);

    method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getStagedSessions();

    method @FlaggedApi("android.content.pm.verification_service") @Nullable public final String getVerificationServiceProvider();

    method @RequiresPermission(allOf={android.Manifest.permission.INSTALL_PACKAGES, "com.android.permission.INSTALL_EXISTING_PACKAGES"}) public void installExistingPackage(@NonNull String, int, @Nullable android.content.IntentSender);

    method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void installPackageArchived(@NonNull android.content.pm.ArchivedPackageInfo, @NonNull android.content.pm.PackageInstaller.SessionParams, @NonNull android.content.IntentSender);

    method @NonNull public android.content.pm.PackageInstaller.Session openSession(int) throws java.io.IOException;
@@ -13263,12 +13263,6 @@ package android.content.pm { 
    field public static final String ACTION_SESSION_COMMITTED = "android.content.pm.action.SESSION_COMMITTED";

    field public static final String ACTION_SESSION_DETAILS = "android.content.pm.action.SESSION_DETAILS";

    field public static final String ACTION_SESSION_UPDATED = "android.content.pm.action.SESSION_UPDATED";

    field @FlaggedApi("android.content.pm.verification_service") public static final int DEVELOPER_VERIFICATION_FAILED_REASON_DEVELOPER_BLOCKED = 2; // 0x2

    field @FlaggedApi("android.content.pm.verification_service") public static final int DEVELOPER_VERIFICATION_FAILED_REASON_NETWORK_UNAVAILABLE = 1; // 0x1

    field @FlaggedApi("android.content.pm.verification_service") public static final int DEVELOPER_VERIFICATION_FAILED_REASON_UNKNOWN = 0; // 0x0

    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_DEVELOPER_VERIFICATION_EXTENSION_RESPONSE = "android.content.pm.extra.DEVELOPER_VERIFICATION_EXTENSION_RESPONSE";

    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_DEVELOPER_VERIFICATION_FAILURE_REASON = "android.content.pm.extra.DEVELOPER_VERIFICATION_FAILURE_REASON";

    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_DEVELOPER_VERIFICATION_LITE_PERFORMED = "android.content.pm.extra.DEVELOPER_VERIFICATION_LITE_PERFORMED";

    field public static final String EXTRA_INSTALL_CONSTRAINTS = "android.content.pm.extra.INSTALL_CONSTRAINTS";

    field public static final String EXTRA_INSTALL_CONSTRAINTS_RESULT = "android.content.pm.extra.INSTALL_CONSTRAINTS_RESULT";

    field public static final String EXTRA_OTHER_PACKAGE_NAME = "android.content.pm.extra.OTHER_PACKAGE_NAME";
@@ -13283,6 +13277,9 @@ package android.content.pm { 
    field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_UNARCHIVE_ID = "android.content.pm.extra.UNARCHIVE_ID";

    field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_UNARCHIVE_PACKAGE_NAME = "android.content.pm.extra.UNARCHIVE_PACKAGE_NAME";

    field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_UNARCHIVE_STATUS = "android.content.pm.extra.UNARCHIVE_STATUS";

    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_VERIFICATION_EXTENSION_RESPONSE = "android.content.pm.extra.VERIFICATION_EXTENSION_RESPONSE";

    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_VERIFICATION_FAILURE_REASON = "android.content.pm.extra.VERIFICATION_FAILURE_REASON";

    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_VERIFICATION_LITE_PERFORMED = "android.content.pm.extra.VERIFICATION_LITE_PERFORMED";

    field public static final int PACKAGE_SOURCE_DOWNLOADED_FILE = 4; // 0x4

    field public static final int PACKAGE_SOURCE_LOCAL_FILE = 3; // 0x3

    field public static final int PACKAGE_SOURCE_OTHER = 1; // 0x1
@@ -13305,6 +13302,9 @@ package android.content.pm { 
    field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_ERROR_USER_ACTION_NEEDED = 1; // 0x1

    field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_GENERIC_ERROR = 100; // 0x64

    field @FlaggedApi("android.content.pm.archiving") public static final int UNARCHIVAL_OK = 0; // 0x0

    field @FlaggedApi("android.content.pm.verification_service") public static final int VERIFICATION_FAILED_REASON_NETWORK_UNAVAILABLE = 1; // 0x1

    field @FlaggedApi("android.content.pm.verification_service") public static final int VERIFICATION_FAILED_REASON_PACKAGE_BLOCKED = 2; // 0x2

    field @FlaggedApi("android.content.pm.verification_service") public static final int VERIFICATION_FAILED_REASON_UNKNOWN = 0; // 0x0

  }















  public static final class PackageInstaller.InstallConstraints implements android.os.Parcelable {

























core/api/system-current.txt



+90
−90


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/content/pm/IPackageInstaller.aidl



+10
−10




























Original line number
Diff line number
Diff line








@@ -22,7 +22,7 @@ import android.content.pm.IPackageDeleteObserver2;













import android.content.pm.IPackageInstallerCallback;















import android.content.pm.IPackageInstallerSession;















import android.content.pm.PackageInstaller;













import android.content.pm.PackageInstaller.DeveloperVerificationUserConfirmationInfo;













import android.content.pm.PackageInstaller.VerificationUserConfirmationInfo;















import android.content.pm.ParceledListSlice;















import android.content.pm.VersionedPackage;















import android.content.IntentSender;










@@ -95,15 +95,15 @@ interface IPackageInstaller {













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES,android.Manifest.permission.REQUEST_INSTALL_PACKAGES})")















    void reportUnarchivalStatus(int unarchiveId, int status, long requiredStorageBytes, in PendingIntent userActionIntent, in UserHandle userHandle);





























    @EnforcePermission("DEVELOPER_VERIFICATION_AGENT")













    int getDeveloperVerificationPolicy(int userId);













    @EnforcePermission("DEVELOPER_VERIFICATION_AGENT")













    boolean setDeveloperVerificationPolicy(int policy, int userId);













    String getDeveloperVerificationServiceProvider();













    @EnforcePermission("VERIFICATION_AGENT")













    int getVerificationPolicy(int userId);













    @EnforcePermission("VERIFICATION_AGENT")













    boolean setVerificationPolicy(int policy, int userId);













    String getVerificationServiceProvider();





























    @EnforcePermission("SET_DEVELOPER_VERIFICATION_USER_RESPONSE")













    void setDeveloperVerificationUserResponse(int sessionId, int developerVerificationUserResponse);













    @EnforcePermission("SET_VERIFICATION_USER_RESPONSE")













    void setVerificationUserResponse(int sessionId, int verificationUserResponse);





























    @EnforcePermission("SET_DEVELOPER_VERIFICATION_USER_RESPONSE")













    DeveloperVerificationUserConfirmationInfo getDeveloperVerificationUserConfirmationInfo(int sessionId);













    @EnforcePermission("SET_VERIFICATION_USER_RESPONSE")













    VerificationUserConfirmationInfo getVerificationUserConfirmationInfo(int sessionId);















}
























core/java/android/content/pm/PackageInstaller.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -20,4 +20,4 @@ parcelable PackageInstaller.InstallConstraints;













parcelable PackageInstaller.SessionParams;















parcelable PackageInstaller.SessionInfo;















parcelable PackageInstaller.PreapprovalDetails;













parcelable PackageInstaller.DeveloperVerificationUserConfirmationInfo;












parcelable PackageInstaller.VerificationUserConfirmationInfo;
























core/java/android/content/pm/PackageInstaller.java



+126
−137


























File changed.
Preview size limit exceeded, changes collapsed.