diff options
| author | 2020-12-31 11:29:17 +0000 | |
|---|---|---|
| committer | 2020-12-31 11:29:17 +0000 | |
| commit | f4930cfd3354adcb2b7183d44fa5ffb2f8285158 (patch) | |
| tree | 6f77117fd424ba1481fa6289e9086f88ff8ac6bb | |
| parent | 33ad4e1225ecf39ceb7bab09c6767e36b09b33e7 (diff) | |
| parent | 9f2c15890cb771bcb929ffd5a29a0333442517de (diff) | |
Merge "Extend RollbackManagerService to handle S extensions" am: 9f2c15890c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517738
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95a1b89798c6e3132db7c3b00a2ddd0a0256e10b
| -rw-r--r-- | services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index ca382c4f3d12..81878e7f5321 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++) { |