Prevent apkInApex failure on T-Go base image
These issues are fix in latest module, but Bluetooth is not updating T
yet. Go devices use the non-Google apex format name.
Bug: 310322439
Test: atest StrictJavaPackagesTest#testApkInApex_nonClasspathClasses
(cherry picked from https://android-review.googlesource.com/q/commit:fb407e33c5cf8c1b5248f94da1933ec031d3cc1a)
Merged-In: I96eb5ff816fe1513e55eb4d1ae9ae03da1d94269
Change-Id: I96eb5ff816fe1513e55eb4d1ae9ae03da1d94269
diff --git a/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java b/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java
index d4db87f..e958637 100644
--- a/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java
+++ b/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java
@@ -701,15 +701,9 @@
ADSERVICES_SANDBOX_APK_IN_APEX_BURNDOWN_LIST)
.build();
- /**
- * Lists of known failures when running testApkInApex_nonClasspathClasses against pre-U devices.
- *
- * <p> Add the new item into this list only if the failure is caused by base device image (not the mainline train).
- */
- private static final ImmutableMap<String, ImmutableSet<String>> PRE_U_APK_IN_APEX_BURNDOWN_LIST =
- new ImmutableMap.Builder<String, ImmutableSet<String>>()
- .put("/apex/com.android.btservices/app/BluetoothGoogle/BluetoothGoogle.apk",
- ImmutableSet.of(
+ // Bluetooth has not been updated on pre-u device
+ private static ImmutableSet<String> PRE_U_APK_IN_APEX_BLUETOOTH_BURNDOWN_LIST =
+ ImmutableSet.of(
// b/310322439
"Lcom/android/bluetooth/x/android/sysprop/AdbProperties;",
"Lcom/android/bluetooth/x/android/sysprop/ApkVerityProperties;",
@@ -732,9 +726,24 @@
"Lcom/android/bluetooth/x/android/sysprop/TraceProperties;",
"Lcom/android/bluetooth/x/android/sysprop/VndkProperties;",
"Lcom/android/bluetooth/x/android/sysprop/VoldProperties;",
- "Lcom/android/bluetooth/x/android/sysprop/WifiProperties;"
- ))
- .build();
+ "Lcom/android/bluetooth/x/android/sysprop/WifiProperties;");
+
+ /**
+ * Lists of known failures when running testApkInApex_nonClasspathClasses against pre-U devices.
+ *
+ * <p>Add the new item into this list only if the failure is caused by base device image (not
+ * the mainline train).
+ */
+ private static final ImmutableMap<String, ImmutableSet<String>>
+ PRE_U_APK_IN_APEX_BURNDOWN_LIST =
+ new ImmutableMap.Builder<String, ImmutableSet<String>>()
+ .put(
+ "/apex/com.android.btservices/app/BluetoothGoogle/BluetoothGoogle.apk",
+ PRE_U_APK_IN_APEX_BLUETOOTH_BURNDOWN_LIST)
+ .put(
+ "/apex/com.android.btservices/app/Bluetooth/Bluetooth.apk",
+ PRE_U_APK_IN_APEX_BLUETOOTH_BURNDOWN_LIST)
+ .build();
/**
* Lists of known failures when running testApkInApex_nonClasspathClasses against pre-T devices.
