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

Commit 1fc10c12 authored by Richard Uhler's avatar Richard Uhler
Browse files

Only allow rollback to be enabled on modules. 

Only allow rollback to be enabled on the modules included in a mainline
update. We don't want to support rollbacks for all apks in general yet.

Enforce that only installers granted the MANAGE_ROLLBACKS permission can
enable rollback for a package.

Introduce a new TEST_MANAGE_ROLLBACKS permission that can be used to
enable rollback on packages that are not modules. This allows us to
continue testing rollbacks, given we can't do a mainline update as part
of the rollback tests.

Test: atest RollbackTest, with new tests for permissions added.
Bug: 128277794
Change-Id: I29ab9a750a1283592b8a855322ece516e42260ca
parent e3cbf906

api/system-current.txt

+4 −3
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ package android { 
    field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";

    field public static final String SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON = "android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON";

    field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";

    field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";

    field public static final String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";

    field public static final String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE";

    field public static final String TV_VIRTUAL_REMOTE_CONTROLLER = "android.permission.TV_VIRTUAL_REMOTE_CONTROLLER";
@@ -1835,9 +1836,9 @@ package android.content.rollback { 
  }















  public final class RollbackManager {













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













    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();













    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getRecentlyCommittedRollbacks();













    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(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();













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















    field public static final String EXTRA_STATUS = "android.content.rollback.extra.STATUS";















    field public static final String EXTRA_STATUS_MESSAGE = "android.content.rollback.extra.STATUS_MESSAGE";















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

































api/test-current.txt



+6
−5




























Original line number
Diff line number
Diff line








@@ -14,6 +14,7 @@ package android {













    field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";















    field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";















    field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";













    field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";















    field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";















    field public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";















    field public static final String WRITE_OBB = "android.permission.WRITE_OBB";










@@ -720,11 +721,11 @@ package android.content.rollback {













  }































  public final class RollbackManager {













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













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













    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();













    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getRecentlyCommittedRollbacks();













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













    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 @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();













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













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















    field public static final String EXTRA_STATUS = "android.content.rollback.extra.STATUS";















    field public static final String EXTRA_STATUS_MESSAGE = "android.content.rollback.extra.STATUS_MESSAGE";















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

































core/java/android/content/rollback/RollbackManager.java



+19
−15




























Original line number
Diff line number
Diff line








@@ -57,10 +57,12 @@ public final class RollbackManager {













    /**















     * Returns a list of all currently available rollbacks.















     *













     * @throws SecurityException if the caller does not have the













     *            MANAGE_ROLLBACKS permission.













     * @throws SecurityException if the caller does not have appropriate permissions.















     */













    @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS)













    @RequiresPermission(anyOf = {













            android.Manifest.permission.MANAGE_ROLLBACKS,













            android.Manifest.permission.TEST_MANAGE_ROLLBACKS













    })















    @NonNull















    public List<RollbackInfo> getAvailableRollbacks() {















        try {









@@ -85,10 +87,12 @@ public final class RollbackManager {













     * rolled back from.















     *















     * @return the recently committed rollbacks













     * @throws SecurityException if the caller does not have the













     *            MANAGE_ROLLBACKS permission.













     * @throws SecurityException if the caller does not have appropriate permissions.















     */













    @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS)













    @RequiresPermission(anyOf = {













            android.Manifest.permission.MANAGE_ROLLBACKS,













            android.Manifest.permission.TEST_MANAGE_ROLLBACKS













    })















    public @NonNull List<RollbackInfo> getRecentlyCommittedRollbacks() {















        try {















            return mBinder.getRecentlyExecutedRollbacks().getList();










@@ -171,10 +175,12 @@ public final class RollbackManager {













     * @param statusReceiver where to deliver the results. Intents sent to















     *                       this receiver contain {@link #EXTRA_STATUS}















     *                       and {@link #EXTRA_STATUS_MESSAGE}.













     * @throws SecurityException if the caller does not have the













     *            MANAGE_ROLLBACKS permission.













     * @throws SecurityException if the caller does not have appropriate permissions.















     */













    @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS)













    @RequiresPermission(anyOf = {













            android.Manifest.permission.MANAGE_ROLLBACKS,













            android.Manifest.permission.TEST_MANAGE_ROLLBACKS













    })















    public void commitRollback(int rollbackId, @NonNull List<VersionedPackage> causePackages,















            @NonNull IntentSender statusReceiver) {















        try {









@@ -191,12 +197,11 @@ public final class RollbackManager {













     * across device reboot, by simulating what happens on reboot without















     * actually rebooting the device.















     *













     * @throws SecurityException if the caller does not have the













     *            MANAGE_ROLLBACKS permission.













     * @throws SecurityException if the caller does not have appropriate permissions.















     *















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS)













    @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS)















    @TestApi















    public void reloadPersistedData() {















        try {









@@ -213,12 +218,11 @@ public final class RollbackManager {













     * recently committed rollbacks that contain the given package.















     *















     * @param packageName the name of the package to expire data for.













     * @throws SecurityException if the caller does not have the













     *            MANAGE_ROLLBACKS permission.













     * @throws SecurityException if the caller does not have appropriate permissions.















     *















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS)













    @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS)















    @TestApi















    public void expireRollbackForPackage(@NonNull String packageName) {















        try {

































core/res/AndroidManifest.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -3929,6 +3929,10 @@













    <permission android:name="android.permission.MANAGE_ROLLBACKS"















        android:protectionLevel="signature|verifier" />





























    <!-- @SystemApi @TestApi @hide Allows testing apk level rollbacks. -->













    <permission android:name="android.permission.TEST_MANAGE_ROLLBACKS"













        android:protectionLevel="signature" />





























    <!-- @SystemApi @hide Allows an application to mark other applications as harmful -->















    <permission android:name="android.permission.SET_HARMFUL_APP_WARNINGS"















        android:protectionLevel="signature|verifier" />

































packages/Shell/AndroidManifest.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -86,6 +86,7 @@













    <uses-permission android:name="android.permission.DELETE_CACHE_FILES" />















    <uses-permission android:name="android.permission.DELETE_PACKAGES" />















    <uses-permission android:name="android.permission.MANAGE_ROLLBACKS" />













    <uses-permission android:name="android.permission.TEST_MANAGE_ROLLBACKS" />















    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />















    <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />















    <uses-permission android:name="android.permission.DEVICE_POWER" />