commit | 35a20256e38a6821907ffa67ff42b6dca5cfe749 | [log] [tgz] |
---|---|---|
author | Xinyi Zhou <zxy@google.com> | Wed Dec 13 20:43:46 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 20:43:46 2023 +0000 |
tree | 03c616064357776def3b4f757ea041e6136ca6e6 | |
parent | ef5af1f0071d51873c521b22612716ad0c591d3d [diff] | |
parent | 3f8cb43ff16d9603074ba401bc243fa86f42f0e2 [diff] |
Merge "Exclude user build devices for the test" into main am: 3f8cb43ff1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871069 Change-Id: I3135511fc146f1751c5c693c71b5ef102dda164d 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 8ee661f..590a46e 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
@@ -193,6 +193,11 @@ @Test @SdkSuppress(minSdkVersion = 32, codeName = "T") public void testOnNearbyDeviceDiscoveredWithDataElements_TIME() { + // The feature only supports user-debug builds. + if (!Build.isDebuggable()) { + return; + } + // Disables the setting of test app support boolean isSupportedTestApp = getDeviceConfigBoolean( NEARBY_SUPPORT_TEST_APP, false /* defaultValue */);