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

Commit 63e6d6af authored by Bill Lin's avatar Bill Lin Committed by Gerrit Code Review
Browse files

Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest" 

* changes:
  Add multi-user test for the general non-staged case
  Increase timeout in testNativeWatchdogTriggersRollback
  Fix flaky testEnableRollbackTimeoutFailsRollback test
  Wait for available rollbacks in RollbackTest.
  Include NewRollbacks in result of getAvailableRollbacks.
  Rename RollbackData to Rollback.
  Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK.
  Update to new RollbackUtils.sendCrashBroadcast API.
  Extend ROLLBACK_COMMITTED broadcast for the multi-user case
  Fix NullPointerException.
  Cleanup some obsolete TODOs and unused code.
  Test Native Watchdog triggers RollbackManager rollback
  Uninstall testapps before running SecondaryUserRollbackTest
  delete ENABLING rollback if we can't get session info for it.
  Add test for rollback of userdata with multiple rollbacks
  Load rollback data in RollbackManagerServiceImpl constructor.
  Use "commit" for rollbacks instead of "execute".
  Add TestApi to block the RollbackManagerHandlerThread.
  Use Slog in RollbackManager, not Log
  Make setRequestDowngrade @TestApi
  Migrate RollbackTest and StagedRollbackTest to cts utils
  Add .apex suffix to apex files during validation
  Add host side test for secondary user rollback
  Reduce ENABLE_ROLLBACK timeout to 0 for timeout test.
parents a150138e 1a6ea954

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -694,6 +694,7 @@ package android.content.pm { 
    method public void setEnableRollback(boolean);

    method @RequiresPermission("android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS") public void setGrantedRuntimePermissions(String[]);

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

    method public void setRequestDowngrade(boolean);

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

  }
@@ -795,6 +796,7 @@ package android.content.rollback { 
  }



  public final class RollbackManager {

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

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) public void commitRollback(int, @NonNull java.util.List<android.content.pm.VersionedPackage>, @NonNull android.content.IntentSender);

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

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();

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

+1 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ public class PackageInstaller { 
        }



        /** {@hide} */

        @SystemApi

        @SystemApi @TestApi

        public void setRequestDowngrade(boolean requestDowngrade) {

            if (requestDowngrade) {

                installFlags |= PackageManager.INSTALL_REQUEST_DOWNGRADE;

core/java/android/content/pm/PackageManagerInternal.java

+0 −6
Original line number Diff line number Diff line
@@ -889,12 +889,6 @@ public abstract class PackageManagerInternal { 
    public static final String EXTRA_ENABLE_ROLLBACK_INSTALL_FLAGS =

            "android.content.pm.extra.ENABLE_ROLLBACK_INSTALL_FLAGS";



    /**

     * Extra field name for the set of installed users for a given rollback package.

     */

    public static final String EXTRA_ENABLE_ROLLBACK_INSTALLED_USERS =

            "android.content.pm.extra.ENABLE_ROLLBACK_INSTALLED_USERS";



    /**

     * Extra field name for the user id an install is associated with when

     * enabling rollback.

core/java/android/content/pm/PackageParser.java

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,8 @@ public class PackageParser { 


    /** @hide */

    public static final String APK_FILE_EXTENSION = ".apk";

    /** @hide */

    public static final String APEX_FILE_EXTENSION = ".apex";



    /** @hide */

    public static class NewPermissionInfo {

core/java/android/content/rollback/IRollbackManager.aidl

+4 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.content.IntentSender; 
interface IRollbackManager {



    ParceledListSlice getAvailableRollbacks();

    ParceledListSlice getRecentlyExecutedRollbacks();

    ParceledListSlice getRecentlyCommittedRollbacks();



    void commitRollback(int rollbackId, in ParceledListSlice causePackages,

            String callerPackageName, in IntentSender statusReceiver);
@@ -51,4 +51,7 @@ interface IRollbackManager { 
    // Used by the staging manager to notify the RollbackManager of the apk

    // session for a staged session.

    void notifyStagedApkSession(int originalSessionId, int apkSessionId);



    // For test purposes only.

    void blockRollbackManager(long millis);

}