From d1625679fba0b54b74ac95aa9adf9df60996df76 Mon Sep 17 00:00:00 2001
From: Xinyi Zhou <zxy@google.com>
Date: Tue, 12 Dec 2023 19:53:40 +0000
Subject: [PATCH] Exclude user build devices for the test
Fix: 313884732
Ignore-AOSP-First: nearby_not_in_aosp_yet
Test: -m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:523eeb3c87bd8f6d353d439120545566f94aaf4c)
Merged-In: Iaaca422cb105c00ded1d84b40afd745abcd651b7
Change-Id: Iaaca422cb105c00ded1d84b40afd745abcd651b7
---
.../server/nearby/provider/ChreDiscoveryProviderTest.java | 5 +++++
1 file changed, 5 insertions(+)
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 8ee661f300..590a46ed3f 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 @@ public class ChreDiscoveryProviderTest {
@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 */);
--
GitLab