commit 6540d0f15c137d334e93905b58c938be666583aa
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 23 00:31:28 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Feb 23 00:31:28 2023 +0000
tree e028f98a0462cfce5f1cd91075c69adf1da17e5d
parent ec34ead633b33579f66c1388ff62110b2b61cff8
parent 964cb37e579a3718dc47185c456782b4382faa45

Snap for 9641457 from 964cb37e579a3718dc47185c456782b4382faa45 to tm-qpr3-release

Change-Id: Ie7d2053c713abfa98b0ef9ceb00b78e102b2abf9

javatests/com/android/os/ext/SdkExtensionsTest.java

diff --git a/javatests/com/android/os/ext/SdkExtensionsTest.java b/javatests/com/android/os/ext/SdkExtensionsTest.java
index 5a2b815..88d6aac 100644
--- a/javatests/com/android/os/ext/SdkExtensionsTest.java
+++ b/javatests/com/android/os/ext/SdkExtensionsTest.java
@@ -105,8 +105,10 @@
         }
         if (SdkLevel.isAtLeastT()) {
             expectedKeys.add(VERSION_CODES.TIRAMISU);
-            if (SdkExtensions.getExtensionVersion(TIRAMISU) >= 4) {
-                // The AdServices extension was added in v4.
+            if (SdkExtensions.getExtensionVersion(VERSION_CODES.S) >= 4) {
+                // The AdServices extension was added in v4 (2022-11). Note that we check the
+                // S extension version in the conditional above because the 22-11-Go train did
+                // not include AdServices, so the T extension version remains 3 (S is 4 though).
                 expectedKeys.add(AD_SERVICES);
             }
         }