diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/net/nsd/NsdServiceInfo.java | 7 | ||||
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 4056ebb..a495e36 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14415,13 +14415,10 @@ package android.net.nsd { 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); @@ -28379,7 +28376,6 @@ package android.view { public class ViewConfiguration { ctor public deprecated ViewConfiguration(); method public static android.view.ViewConfiguration get(android.content.Context); - method public long getDeviceGlobalActionKeyTimeout(); method public static int getDoubleTapTimeout(); method public static deprecated int getEdgeSlop(); method public static deprecated int getFadingEdgeLength(); 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 @@ public final class NsdServiceInfo implements Parcelable { * <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 @@ public final class NsdServiceInfo implements Parcelable { } } - /** Remove an attribute by key */ + /** + * Remove an attribute by key + * @hide + */ public void removeAttribute(String key) { mTxtRecord.remove(key); } @@ -160,6 +164,7 @@ public final class NsdServiceInfo implements Parcelable { * * <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); diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 4b8541e..802c666 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -702,8 +702,9 @@ public class ViewConfiguration { * * @return how long a user needs to press the relevant key to bring up * the global actions dialog. - * @deprecated use getDeviceGlobalActionKeyTimeout + * @deprecated */ + @Deprecated public static long getGlobalActionKeyTimeout() { return GLOBAL_ACTIONS_KEY_TIMEOUT; } @@ -714,6 +715,7 @@ public class ViewConfiguration { * * @return how long a user needs to press the relevant key to bring up * the global actions dialog. + * @hide */ public long getDeviceGlobalActionKeyTimeout() { return mGlobalActionsKeyTimeout; |