Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Extend RollbackManagerService to handle S extensions" am: 9f2c15890c am: f4930cfd33

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0525af7088d087667169b6bda6e9a5d037ea3feb
This commit is contained in:
Anton Hansson
2020-12-31 12:04:02 +00:00
committed by Automerger Merge Worker
parent 2103e9b0d7 f4930cfd33
commit 4b72f351ac
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
View File

@@ -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++) {