Don't recommend Android TV Tiramisu
We are retiring T as a version in Android TV. Moving the T image to the
non-recommended menu should dissuade developers from creating a T images
if not required.
Bug: 286188059
Test: Build and test AVD Manager.
Change-Id: If7547545abab6514d575c1678410f68f3266c8c6
diff --git a/android/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanel.java b/android/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanel.java
index 06b8c98..1cbc30f 100644
--- a/android/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanel.java
+++ b/android/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanel.java
@@ -25,6 +25,7 @@
import static com.android.sdklib.AndroidVersion.MIN_RESIZABLE_DEVICE_API;
import static com.android.sdklib.AndroidVersion.MIN_RECOMMENDED_API;
import static com.android.sdklib.AndroidVersion.MIN_RECOMMENDED_WEAR_API;
+import static com.android.sdklib.AndroidVersion.VersionCodes.TIRAMISU;
import com.android.repository.Revision;
import com.android.resources.ScreenOrientation;
@@ -208,7 +209,8 @@
}
if (SystemImageDescription.TAGS_WITH_GOOGLE_API.contains(tag) &&
(isArm64HostOs ||
- SystemImageDescription.TV_TAGS.contains(tag) || // Android TV does not ship x86_64 images at any API level.
+ (SystemImageDescription.TV_TAGS.contains(tag) && // Android TV does not ship x86_64 images at any API level.
+ apiLevel != TIRAMISU) || // Tiramisu is an unsupported Android TV version.
(apiLevel <= MAX_32_BIT_API && abi == Abi.X86) ||
(apiLevel > MAX_32_BIT_API && abi == Abi.X86_64))
) {
diff --git a/intellij.android.avdmanager.tests/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanelTest.java b/intellij.android.avdmanager.tests/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanelTest.java
index fdf7c93..c5f2534 100644
--- a/intellij.android.avdmanager.tests/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanelTest.java
+++ b/intellij.android.avdmanager.tests/src/com/android/tools/idea/avdmanager/ChooseSystemImagePanelTest.java
@@ -386,6 +386,10 @@
getClassificationFromParts(Abi.X86, new AndroidVersion(31), ANDROID_TV_TAG, isArmHostOs));
assertEquals(isArmHostOs ? OTHER : RECOMMENDED,
getClassificationFromParts(Abi.X86, new AndroidVersion(31), GOOGLE_TV_TAG, isArmHostOs));
+ assertEquals(isArmHostOs ? OTHER : PERFORMANT,
+ getClassificationFromParts(Abi.X86, new AndroidVersion(33), ANDROID_TV_TAG, isArmHostOs));
+ assertEquals(isArmHostOs ? OTHER : PERFORMANT,
+ getClassificationFromParts(Abi.X86, new AndroidVersion(33), GOOGLE_TV_TAG, isArmHostOs));
}
}
