Merge "Address lint errors in aosp/2988611 & aosp/2869978" into main
This commit is contained in:
commit
63af99786d
2 changed files with 6 additions and 4 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue