diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-16 07:43:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-16 07:43:03 +0000 |
| commit | 705d85bf3f8132180486a625e814bfd549ed70ae (patch) | |
| tree | acfea9816d6d3607a82a7337a3737ea126a3af42 | |
| parent | 84e39a99f92452a679f3b7b995cc09743f7143da (diff) | |
| parent | d86035f6624b877aa5165e7f0c7509090018713d (diff) | |
| download | Connectivity-705d85bf3f8132180486a625e814bfd549ed70ae.tar.gz | |
Merge "Revert "Temporarily disable NsdService unit tests"" into tm-dev
| -rw-r--r-- | tests/unit/java/android/net/nsd/NsdServiceInfoTest.java | 4 | ||||
| -rw-r--r-- | tests/unit/java/com/android/server/NsdServiceTest.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java index 829b824d5a..892e1401cc 100644 --- a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java +++ b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java @@ -42,9 +42,7 @@ import java.util.Map; @RunWith(DevSdkIgnoreRunner.class) @SmallTest -// TODO(b/234099453): re-enable once a newer prebuilt is available -// @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.CUR_DEVELOPMENT) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) 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 d3cfb76b88..ed9e930500 100644 --- a/tests/unit/java/com/android/server/NsdServiceTest.java +++ b/tests/unit/java/com/android/server/NsdServiceTest.java @@ -83,9 +83,7 @@ import java.util.Queue; // - test NSD_ON ENABLE/DISABLED listening @RunWith(DevSdkIgnoreRunner.class) @SmallTest -// TODO(b/234099453): re-enable once a newer prebuilt is available -// @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.CUR_DEVELOPMENT) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NsdServiceTest { static final int PROTOCOL = NsdManager.PROTOCOL_DNS_SD; |