diff options
| author | Pedro Loureiro <pedroql@google.com> | 2023-10-03 17:09:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-03 17:09:55 +0000 |
| commit | 7cab78c260b76b5fb65b79ecd1ab40a04909614e (patch) | |
| tree | 535af4e9262a3c194372d42a82c35102ce159568 /java/com | |
| parent | 3f9fc679d4c032025cc201ff479c36f24b334878 (diff) | |
| parent | 030ee4f58a40a1c865d4f4f20abc8e65984494b0 (diff) | |
| download | modules-utils-7cab78c260b76b5fb65b79ecd1ab40a04909614e.tar.gz | |
Fix UnboundedSdkLevel on Q am: 030ee4f58a
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2715514
Change-Id: I0138f3041ca9bdf5adf99dd87ac7b099da6acd46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/com')
| -rw-r--r-- | java/com/android/modules/utils/build/UnboundedSdkLevel.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/java/com/android/modules/utils/build/UnboundedSdkLevel.java b/java/com/android/modules/utils/build/UnboundedSdkLevel.java index 48185d5..cc84172 100644 --- a/java/com/android/modules/utils/build/UnboundedSdkLevel.java +++ b/java/com/android/modules/utils/build/UnboundedSdkLevel.java @@ -17,6 +17,7 @@ package com.android.modules.utils.build; import android.os.Build; +import android.util.ArraySet; import android.util.SparseArray; import androidx.annotation.NonNull; @@ -50,10 +51,22 @@ public final class UnboundedSdkLevel { private static final SparseArray<Set<String>> PREVIOUS_CODENAMES = new SparseArray<>(4); static { - PREVIOUS_CODENAMES.put(29, Set.of("Q")); - PREVIOUS_CODENAMES.put(30, Set.of("Q", "R")); - PREVIOUS_CODENAMES.put(31, Set.of("Q", "R", "S")); - PREVIOUS_CODENAMES.put(32, Set.of("Q", "R", "S", "Sv2")); + PREVIOUS_CODENAMES.put(29, setOf("Q")); + PREVIOUS_CODENAMES.put(30, setOf("Q", "R")); + PREVIOUS_CODENAMES.put(31, setOf("Q", "R", "S")); + PREVIOUS_CODENAMES.put(32, setOf("Q", "R", "S", "Sv2")); + } + + private static Set<String> setOf(String ... contents) { + if (SdkLevel.isAtLeastR()) { + return Set.of(contents); + } + // legacy code for Q + Set<String> set = new ArraySet(contents.length); + for (String codename : contents) { + set.add(codename); + } + return set; } private static final UnboundedSdkLevel sInstance = |