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

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

Merge changes from topics "clean-api_recoverabilityDetection",... 

Merge changes from topics "clean-api_recoverabilityDetection", "clean-recoverabilityDetection" into main

* changes:
  Remove recoverability_detection flag from APIs
  Cleaning up recoverability_detection flag
parents d9f8e5f2 e92975ac

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -4199,7 +4199,7 @@ package android.content.pm { 
    method public void setInstallAsInstantApp(boolean);

    method public void setInstallAsVirtualPreload();

    method public void setRequestDowngrade(boolean);

    method @FlaggedApi("android.content.pm.recoverability_detection") @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void setRollbackImpactLevel(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void setRollbackImpactLevel(int);

    method @FlaggedApi("android.content.pm.rollback_lifetime") @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void setRollbackLifetimeMillis(long);

    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setStaged();

  }
@@ -4374,9 +4374,9 @@ package android.content.pm { 
    field public static final int ROLLBACK_DATA_POLICY_RESTORE = 0; // 0x0

    field public static final int ROLLBACK_DATA_POLICY_RETAIN = 2; // 0x2

    field public static final int ROLLBACK_DATA_POLICY_WIPE = 1; // 0x1

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

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

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

    field public static final int ROLLBACK_USER_IMPACT_HIGH = 1; // 0x1

    field public static final int ROLLBACK_USER_IMPACT_LOW = 0; // 0x0

    field public static final int ROLLBACK_USER_IMPACT_ONLY_MANUAL = 2; // 0x2

    field public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_HIDDEN = 0; // 0x0

    field public static final int SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_VISIBLE = 1; // 0x1

    field public static final int SYSTEM_APP_STATE_INSTALLED = 2; // 0x2

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

+0 −1
Original line number Diff line number Diff line
@@ -3250,7 +3250,6 @@ public class PackageInstaller { 
         */

        @SystemApi

        @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS)

        @FlaggedApi(Flags.FLAG_RECOVERABILITY_DETECTION)

        public void setRollbackImpactLevel(@PackageManager.RollbackImpactLevel int impactLevel) {

            if ((installFlags & PackageManager.INSTALL_ENABLE_ROLLBACK) == 0) {

                throw new IllegalArgumentException(

core/java/android/content/pm/PackageManager.java

+0 −3
Original line number Diff line number Diff line
@@ -1619,7 +1619,6 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @FlaggedApi(android.content.pm.Flags.FLAG_RECOVERABILITY_DETECTION)

    public static final int ROLLBACK_USER_IMPACT_LOW = 0;



    /**
@@ -1629,7 +1628,6 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @FlaggedApi(android.content.pm.Flags.FLAG_RECOVERABILITY_DETECTION)

    public static final int ROLLBACK_USER_IMPACT_HIGH = 1;



    /**
@@ -1638,7 +1636,6 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @FlaggedApi(android.content.pm.Flags.FLAG_RECOVERABILITY_DETECTION)

    public static final int ROLLBACK_USER_IMPACT_ONLY_MANUAL = 2;



    /** @hide */

services/core/java/com/android/server/pm/PackageInstallerService.java

+13 −15
Original line number Diff line number Diff line
@@ -805,7 +805,6 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
            }

        }



        if (Flags.recoverabilityDetection()) {

        if (params.rollbackImpactLevel == PackageManager.ROLLBACK_USER_IMPACT_HIGH

                || params.rollbackImpactLevel

                == PackageManager.ROLLBACK_USER_IMPACT_ONLY_MANUAL) {
@@ -821,7 +820,6 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        } else if (params.rollbackImpactLevel < 0) {

            throw new IllegalArgumentException("rollbackImpactLevel can't be negative.");

        }

        }



        boolean isApex = (params.installFlags & PackageManager.INSTALL_APEX) != 0;

        if (isApex) {

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+3 −8
Original line number Diff line number Diff line
@@ -3561,9 +3561,6 @@ class PackageManagerShellCommand extends ShellCommand { 
                    sessionParams.setEnableRollback(true, rollbackStrategy);

                    break;

                case "--rollback-impact-level":

                    if (!Flags.recoverabilityDetection()) {

                        throw new IllegalArgumentException("Unknown option " + opt);

                    }

                    int rollbackImpactLevel = Integer.parseInt(peekNextArg());

                    if (rollbackImpactLevel < PackageManager.ROLLBACK_USER_IMPACT_LOW

                            || rollbackImpactLevel
@@ -4775,11 +4772,9 @@ class PackageManagerShellCommand extends ShellCommand { 
        pw.println("      --full: cause the app to be installed as a non-ephemeral full app");

        pw.println("      --enable-rollback: enable rollbacks for the upgrade.");

        pw.println("          0=restore (default), 1=wipe, 2=retain");

        if (Flags.recoverabilityDetection()) {

        pw.println(

                "      --rollback-impact-level: set device impact required for rollback.");

        pw.println("          0=low (default), 1=high, 2=manual only");

        }

        pw.println("      --install-location: force the install location:");

        pw.println("          0=auto, 1=internal only, 2=prefer external");

        pw.println("      --install-reason: indicates why the app is being installed:");