From 8dae0e73ef4ccead69dbe533f716d76a3f056dd4 Mon Sep 17 00:00:00 2001 From: Paul Hu Date: Fri, 29 Mar 2024 02:22:59 +0000 Subject: [PATCH] Address lint errors in aosp/2988611 & aosp/2869978 Test: atest FrameworksNetTests NsdManagerTest Change-Id: I9b621f40b9efa5693709cb30bf931e9c8078b47e --- .../src/com/android/server/connectivity/mdns/MdnsRecord.java | 5 +++-- .../server/connectivity/mdns/MdnsServiceTypeClient.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsRecord.java b/service-t/src/com/android/server/connectivity/mdns/MdnsRecord.java index 4b43989a53..1f9f42bcb6 100644 --- a/service-t/src/com/android/server/connectivity/mdns/MdnsRecord.java +++ b/service-t/src/com/android/server/connectivity/mdns/MdnsRecord.java @@ -23,7 +23,8 @@ import android.annotation.Nullable; import android.os.SystemClock; import android.text.TextUtils; -import com.android.internal.annotations.VisibleForTesting; +import androidx.annotation.VisibleForTesting; + import com.android.server.connectivity.mdns.util.MdnsUtils; import java.io.IOException; @@ -231,7 +232,7 @@ public abstract class MdnsRecord { * @param writer The writer to use. * @param now The current system time. This is used when writing the updated TTL. */ - @VisibleForTesting + @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) public final void write(MdnsPacketWriter writer, long now) throws IOException { writeHeaderFields(writer); diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java b/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java index f0f3ffb054..b3bdbe0667 100644 --- a/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java +++ b/service-t/src/com/android/server/connectivity/mdns/MdnsServiceTypeClient.java @@ -30,7 +30,8 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.Pair; -import com.android.internal.annotations.VisibleForTesting; +import androidx.annotation.VisibleForTesting; + import com.android.net.module.util.CollectionUtils; import com.android.net.module.util.SharedLog; import com.android.server.connectivity.mdns.util.MdnsUtils; @@ -195,7 +196,7 @@ public class MdnsServiceTypeClient { /** * Dependencies of MdnsServiceTypeClient, for injection in tests. */ - @VisibleForTesting + @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) public static class Dependencies { /** * @see Handler#sendMessageDelayed(Message, long)