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

Merge "Migrate to SdkExtensions.getAllExtensionVersion()"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-06 06:24:09 +00:00
committed by Android (Google) Code Review
parent b2b2a5d03a 324ba75ab6
commit 40d91e1413
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,6 @@ import android.content.rollback.IRollbackManager;
import android.content.rollback.RollbackInfo;
import android.content.rollback.RollbackManager;
import android.os.Binder;
import android.os.Build;
import android.os.Environment;
import android.os.Handler;
import android.os.HandlerExecutor;
@@ -86,6 +85,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
@@ -1284,14 +1284,10 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
}
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, Build.VERSION_CODES.S };
SparseIntArray result = new SparseIntArray(relevantSdkVersions.length);
for (int i = 0; i < relevantSdkVersions.length; i++) {
result.put(relevantSdkVersions[i],
SdkExtensions.getExtensionVersion(relevantSdkVersions[i]));
Map<Integer, Integer> allExtensionVersions = SdkExtensions.getAllExtensionVersions();
SparseIntArray result = new SparseIntArray(allExtensionVersions.size());
for (int extension : allExtensionVersions.keySet()) {
result.put(extension, allExtensionVersions.get(extension));
}
return result;
}