Merge "Remove the VisibleForTesting annotation." into main
This commit is contained in:
commit
9dbe69420d
4 changed files with 0 additions and 12 deletions
|
|
@ -18,8 +18,6 @@ package com.android.server.connectivity.mdns;
|
|||
|
||||
import android.annotation.Nullable;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.Inet4Address;
|
||||
import java.net.Inet6Address;
|
||||
|
|
@ -29,7 +27,6 @@ import java.util.Locale;
|
|||
import java.util.Objects;
|
||||
|
||||
/** An mDNS "AAAA" or "A" record, which holds an IPv6 or IPv4 address. */
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
|
||||
public class MdnsInetAddressRecord extends MdnsRecord {
|
||||
@Nullable private Inet6Address inet6Address;
|
||||
@Nullable private Inet4Address inet4Address;
|
||||
|
|
|
|||
|
|
@ -18,15 +18,12 @@ package com.android.server.connectivity.mdns;
|
|||
|
||||
import android.annotation.Nullable;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.net.module.util.DnsUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
/** An mDNS "PTR" record, which holds a name (the "pointer"). */
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
|
||||
public class MdnsPointerRecord extends MdnsRecord {
|
||||
private String[] pointer;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ package com.android.server.connectivity.mdns;
|
|||
|
||||
import android.annotation.Nullable;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.net.module.util.DnsUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
|
|
@ -28,7 +26,6 @@ import java.util.Locale;
|
|||
import java.util.Objects;
|
||||
|
||||
/** An mDNS "SRV" record, which contains service information. */
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
|
||||
public class MdnsServiceRecord extends MdnsRecord {
|
||||
public static final int PROTO_NONE = 0;
|
||||
public static final int PROTO_TCP = 1;
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ package com.android.server.connectivity.mdns;
|
|||
|
||||
import android.annotation.Nullable;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.server.connectivity.mdns.MdnsServiceInfo.TextEntry;
|
||||
|
||||
import java.io.IOException;
|
||||
|
|
@ -29,7 +27,6 @@ import java.util.List;
|
|||
import java.util.Objects;
|
||||
|
||||
/** An mDNS "TXT" record, which contains a list of {@link TextEntry}. */
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
|
||||
public class MdnsTextRecord extends MdnsRecord {
|
||||
private List<TextEntry> entries;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue