| commit | fb3ceb0f11771dcd6ef71476e2cf1f1c8334a9ac | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 02 11:30:34 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 02 11:30:34 2022 +0000 |
| tree | 9ad11eed18418a670e9ec83dee4dd9ab5b974132 | |
| parent | 9c4475a513fb231778c3e37736bffdb29f2522e2 [diff] | |
| parent | ddab1f4294fa812180a4994a49294e3c4881517f [diff] |
Merge changes from topic "cherrypicker-L15200000954882986:N47600001270136565" into tm-dev am: 3caf95c8fc am: ddab1f4294 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18691267 Change-Id: I5e42561d08f4379a579f9913b4b31b03790b938a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java index 892e140..829b824 100644 --- a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java +++ b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java
@@ -42,7 +42,9 @@ @RunWith(DevSdkIgnoreRunner.class) @SmallTest -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +// TODO(b/234099453): re-enable once a newer prebuilt is available +// @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.CUR_DEVELOPMENT) public class NsdServiceInfoTest { public final static InetAddress LOCALHOST;
diff --git a/tests/unit/java/com/android/server/NsdServiceTest.java b/tests/unit/java/com/android/server/NsdServiceTest.java index ed9e930..d3cfb76 100644 --- a/tests/unit/java/com/android/server/NsdServiceTest.java +++ b/tests/unit/java/com/android/server/NsdServiceTest.java
@@ -83,7 +83,9 @@ // - test NSD_ON ENABLE/DISABLED listening @RunWith(DevSdkIgnoreRunner.class) @SmallTest -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +// TODO(b/234099453): re-enable once a newer prebuilt is available +// @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.CUR_DEVELOPMENT) public class NsdServiceTest { static final int PROTOCOL = NsdManager.PROTOCOL_DNS_SD;