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

Commit f4930cfd authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Extend RollbackManagerService to handle S extensions" am: 9f2c1589 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95a1b89798c6e3132db7c3b00a2ddd0a0256e10b
parents 33ad4e12 9f2c1589

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
    private SparseIntArray getExtensionVersions() {

        // This list must be updated whenever the current API level is increased, or should be

        // replaced when we have another way of determining the relevant SDK versions.

        final int[] relevantSdkVersions = { Build.VERSION_CODES.R };

        final int[] relevantSdkVersions = { Build.VERSION_CODES.R, Build.VERSION_CODES.S };



        SparseIntArray result = new SparseIntArray(relevantSdkVersions.length);

        for (int i = 0; i < relevantSdkVersions.length; i++) {