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

Commit c5a7a543 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Make RollbackInfo#getRollbackImpactLevel SystemApi" into main

parents 61dfb4a0 4255153f

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4632,6 +4632,7 @@ package android.content.rollback { 
    method public int getCommittedSessionId();

    method @NonNull public java.util.List<android.content.rollback.PackageRollbackInfo> getPackages();

    method public int getRollbackId();

    method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") public int getRollbackImpactLevel();

    method public boolean isStaged();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.content.rollback.RollbackInfo> CREATOR;

core/api/test-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -1269,10 +1269,6 @@ package android.content.res { 


package android.content.rollback {



  public final class RollbackInfo implements android.os.Parcelable {

    method @FlaggedApi("android.content.pm.recoverability_detection") public int getRollbackImpactLevel();

  }



  public final class RollbackManager {

    method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void blockRollbackManager(long);

    method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void expireRollbackForPackage(@NonNull String);

core/java/android/content/rollback/RollbackInfo.java

+1 −6
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package android.content.rollback; 
import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.content.pm.Flags;

import android.content.pm.PackageManager;

import android.content.pm.VersionedPackage;

import android.os.Parcel;
@@ -136,11 +134,8 @@ public final class RollbackInfo implements Parcelable { 
     * Get rollback impact level. Refer {@link

     * android.content.pm.PackageInstaller.SessionParams#setRollbackImpactLevel(int)} for more info

     * on impact level.

     *

     * @hide

     */

    @TestApi

    @FlaggedApi(Flags.FLAG_RECOVERABILITY_DETECTION)

    @FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY)

    public @PackageManager.RollbackImpactLevel int getRollbackImpactLevel() {

        return mRollbackImpactLevel;

    }