From 3dd7ca7fa5b47c25cdfba3f22c3ab5b7a20faec4 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 3 Dec 2020 18:02:28 +0000
Subject: [PATCH] Extend RollbackManagerService to handle S extensions

Bug: 173114427
Test: RollbackUnitTest covers this
Change-Id: I2de18f67f21ea6c57d612829749edeaa11378f41
Merged-In: I2de18f67f21ea6c57d612829749edeaa11378f41
---
 .../com/android/server/rollback/RollbackManagerServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index ca382c4f3d126..81878e7f53218 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -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++) {