commit | c6c450345c0e73a251e7ca54d076061163c7b947 | [log] [tgz] |
---|---|---|
author | Xinyi Zhou <zxy@google.com> | Wed Dec 13 20:42:35 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 20:42:35 2023 +0000 |
tree | f31966c9111a3f5a20da913913a52df2b4c01b88 | |
parent | ebbfeee740e42732ace3b0d8ea63f3d96f27d94a [diff] | |
parent | d9da74a98ea3a1206066c16f4d6ef03e6d1c5cba [diff] |
[nearby] Fix the user-debug only test am: d9da74a98e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871062 Change-Id: Ia0aa5e77b26089e2e134de6602cf3fcd233e02fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java b/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java index 154441b..6f035a9 100644 --- a/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java +++ b/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java
@@ -288,8 +288,12 @@ } @Test - @SdkSuppress(minSdkVersion = 32, codeName = "T") + @SdkSuppress(minSdkVersion = 33, codeName = "T") public void testOnNearbyDeviceDiscoveredWithTestDataElements() { + // The feature only supports user-debug builds. + if (!Build.isDebuggable()) { + return; + } // Enables the setting of test app support boolean isSupportedTestApp = getDeviceConfigBoolean( NEARBY_SUPPORT_TEST_APP, false /* defaultValue */);