Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev
diff --git a/api/current.txt b/api/current.txt
index 1d925d5..6bf83c0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14418,13 +14418,10 @@
public final class NsdServiceInfo implements android.os.Parcelable {
ctor public NsdServiceInfo();
method public int describeContents();
- method public java.util.Map<java.lang.String, byte[]> getAttributes();
method public java.net.InetAddress getHost();
method public int getPort();
method public java.lang.String getServiceName();
method public java.lang.String getServiceType();
- method public void removeAttribute(java.lang.String);
- method public void setAttribute(java.lang.String, java.lang.String);
method public void setHost(java.net.InetAddress);
method public void setPort(int);
method public void setServiceName(java.lang.String);
diff --git a/core/java/android/net/nsd/NsdServiceInfo.java b/core/java/android/net/nsd/NsdServiceInfo.java
index 6fdb0d0..8f52a7c 100644
--- a/core/java/android/net/nsd/NsdServiceInfo.java
+++ b/core/java/android/net/nsd/NsdServiceInfo.java
@@ -141,6 +141,7 @@
* <p> Keys should be short, ideally no more than 9 characters, and unique per instance of
* {@link NsdServiceInfo}. Calling {@link #setAttribute} twice with the same key will overwrite
* first value.
+ * @hide
*/
public void setAttribute(String key, String value) {
try {
@@ -150,7 +151,10 @@
}
}
- /** Remove an attribute by key */
+ /**
+ * Remove an attribute by key
+ * @hide
+ */
public void removeAttribute(String key) {
mTxtRecord.remove(key);
}
@@ -160,6 +164,7 @@
*
* <p> The returned map is unmodifiable; changes must be made through {@link #setAttribute} and
* {@link #removeAttribute}.
+ * @hide
*/
public Map<String, byte[]> getAttributes() {
return Collections.unmodifiableMap(mTxtRecord);