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

Commit 691ac9e7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am a6a5bea4: am 07b76d6f: am 1d98fbf2: Merge "Update API naming to follow...

am a6a5bea4: am 07b76d6f: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev

* commit 'a6a5bea41779c3f0764a2c0f18f1251649ddd1ee':
  Update API naming to follow style guide.
parents 9f6d5a89 ec20c174
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8583,11 +8583,11 @@ package android.content.pm {
  }
  public static class PackageInstaller.SessionInfo implements android.os.Parcelable {
    method public android.content.Intent createDetailsIntent();
    method public int describeContents();
    method public android.graphics.Bitmap getAppIcon();
    method public java.lang.CharSequence getAppLabel();
    method public java.lang.String getAppPackageName();
    method public android.content.Intent getDetailsIntent();
    method public java.lang.String getInstallerPackageName();
    method public float getProgress();
    method public int getSessionId();
+8 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class PackageInstaller {
     * may surface actions such as pause, resume, or cancel.
     * <p>
     * This should always be scoped to the installer package that owns the
     * session. Clients should use {@link SessionInfo#getDetailsIntent()} to
     * session. Clients should use {@link SessionInfo#createDetailsIntent()} to
     * build this intent correctly.
     * <p>
     * In some cases, a matching Activity may not exist, so ensure you safeguard
@@ -1174,7 +1174,7 @@ public class PackageInstaller {
         *
         * @see PackageInstaller#ACTION_SESSION_DETAILS
         */
        public @Nullable Intent getDetailsIntent() {
        public @Nullable Intent createDetailsIntent() {
            final Intent intent = new Intent(PackageInstaller.ACTION_SESSION_DETAILS);
            intent.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);
            intent.setPackage(installerPackageName);
@@ -1182,6 +1182,12 @@ public class PackageInstaller {
            return intent;
        }

        /** {@hide} */
        @Deprecated
        public @Nullable Intent getDetailsIntent() {
            return createDetailsIntent();
        }

        @Override
        public int describeContents() {
            return 0;