Merge changes from topic "presubmit-am-f8d27b6bc1d0451b9ed1a0c7dc135ce0" into udc-dev
* changes:
[automerge] uwb[aidl]: Added LAST_STS_INDEX_USED config into CCC open ranging params 2p: 9bd47ef77c
uwb[aidl]: Added LAST_STS_INDEX_USED config into CCC open ranging params
diff --git a/audio/aidl/vts/EffectHelper.h b/audio/aidl/vts/EffectHelper.h
index f6683cc..831977b 100644
--- a/audio/aidl/vts/EffectHelper.h
+++ b/audio/aidl/vts/EffectHelper.h
@@ -228,10 +228,10 @@
*/
template <typename S, typename = std::enable_if_t<std::is_arithmetic_v<S>>>
static std::set<S> expandTestValueBasic(std::set<S>& s) {
- const auto min = *s.begin(), max = *s.rbegin();
const auto minLimit = std::numeric_limits<S>::min(),
maxLimit = std::numeric_limits<S>::max();
if (s.size()) {
+ const auto min = *s.begin(), max = *s.rbegin();
s.insert(min + (max - min) / 2);
if (min != minLimit) {
s.insert(min - 1);
diff --git a/drm/aidl/Android.bp b/drm/aidl/Android.bp
index 6273a38..fb04d84 100644
--- a/drm/aidl/Android.bp
+++ b/drm/aidl/Android.bp
@@ -23,7 +23,7 @@
sdk_version: "module_current",
},
ndk: {
- min_sdk_version: "current",
+ min_sdk_version: "UpsideDownCake",
},
},
double_loadable: true,
diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp
index 5e303bb..d8a5a87 100644
--- a/identity/aidl/vts/Android.bp
+++ b/identity/aidl/vts/Android.bp
@@ -66,7 +66,6 @@
name: "IdentityCredentialImplementedTest",
libs: [
"tradefed",
- "vts-core-tradefed-harness",
],
srcs: ["src/**/*.java"],
test_suites: [
diff --git a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
index 07817cc..adc9b73 100644
--- a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
+++ b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
@@ -92,14 +92,21 @@
}
/*
- * GetApfPacketFilterCapabilities
+ * CheckApfIsSupported:
+ * Ensures the APF packet filter is fully supported as required in VSR 14:
+ * https://docs.partner.android.com/gms/policies/vsr/vsr-14
*/
-TEST_P(WifiStaIfaceAidlTest, GetApfPacketFilterCapabilities) {
- if (!isFeatureSupported(IWifiStaIface::FeatureSetMask::APF)) {
- GTEST_SKIP() << "APF packet filter capabilities are not supported.";
- }
+TEST_P(WifiStaIfaceAidlTest, CheckApfIsSupported) {
+ // It is not required to check the vendor API level is at least U here
+ // because the Wi-Fi AIDL interface is launched with Android U(VSR-14).
+ // TODO: Add wavier list to the chipsets that doesn't support APF.
+ EXPECT_TRUE(isFeatureSupported(IWifiStaIface::FeatureSetMask::APF));
StaApfPacketFilterCapabilities apf_caps = {};
EXPECT_TRUE(wifi_sta_iface_->getApfPacketFilterCapabilities(&apf_caps).isOk());
+ // The APF version must be 4 and the usable memory must be at least
+ // 1024 bytes.
+ EXPECT_EQ(apf_caps.version, 4);
+ EXPECT_GE(apf_caps.maxLength, 1024);
}
/*