diff options
| -rw-r--r-- | api/current.txt | 7 | ||||
| -rw-r--r-- | core/java/android/hardware/usb/UsbDevice.java | 3 | ||||
| -rw-r--r-- | core/java/android/net/nsd/NsdServiceInfo.java | 7 | ||||
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/api/current.txt b/api/current.txt index d8f9e80..4712112 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11229,10 +11229,7 @@ package android.hardware.usb { method public int getDeviceSubclass(); method public android.hardware.usb.UsbInterface getInterface(int); method public int getInterfaceCount(); - method public java.lang.String getManufacturerName(); method public int getProductId(); - method public java.lang.String getProductName(); - method public java.lang.String getSerialNumber(); method public int getVendorId(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; @@ -14417,13 +14414,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); @@ -28381,7 +28375,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/hardware/usb/UsbDevice.java b/core/java/android/hardware/usb/UsbDevice.java index d1e63f6..320ccfe 100644 --- a/core/java/android/hardware/usb/UsbDevice.java +++ b/core/java/android/hardware/usb/UsbDevice.java @@ -91,6 +91,7 @@ public class UsbDevice implements Parcelable { * Returns the manufacturer name of the device. * * @return the manufacturer name + * @hide */ public String getManufacturerName() { return mManufacturerName; @@ -100,6 +101,7 @@ public class UsbDevice implements Parcelable { * Returns the product name of the device. * * @return the product name + * @hide */ public String getProductName() { return mProductName; @@ -109,6 +111,7 @@ public class UsbDevice implements Parcelable { * Returns the serial number of the device. * * @return the serial number name + * @hide */ public String getSerialNumber() { return mSerialNumber; 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; |