commit | 956db0034d573231b845a24b8f3d40f08a531d38 | [log] [tgz] |
---|---|---|
author | Xinyi Zhou <zxy@google.com> | Wed Dec 13 21:15:26 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 21:15:26 2023 +0000 |
tree | 03c616064357776def3b4f757ea041e6136ca6e6 | |
parent | 5a937d00725d0146de774f74c90ec272182bd3c8 [diff] | |
parent | 35a20256e38a6821907ffa67ff42b6dca5cfe749 [diff] |
Merge "Exclude user build devices for the test" into main am: 3f8cb43ff1 am: 35a20256e3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871069 Change-Id: I653a27c8c481264f9eeee99d39561797610c17ed 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 */);