diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-04-17 12:52:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-17 12:52:20 -0700 |
| commit | 26c246a3f12553c9c4667d7ee32ce137638a9b07 (patch) | |
| tree | 2bae188f97206b4654d0fcbd6b1766416d3a5db1 | |
| parent | b85a769e0bc5c2ada8322c4c3f3cc338d71e8bfe (diff) | |
| parent | 453d98fc703a957cb7e9ee0d2ee97bf4ab781b00 (diff) | |
| download | frameworks_base-26c246a3f12553c9c4667d7ee32ce137638a9b07.zip frameworks_base-26c246a3f12553c9c4667d7ee32ce137638a9b07.tar.gz frameworks_base-26c246a3f12553c9c4667d7ee32ce137638a9b07.tar.bz2 | |
Merge "fix build - new current.txt"
| -rw-r--r-- | api/current.txt | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/api/current.txt b/api/current.txt index d0651eb..da28937 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9798,8 +9798,8 @@ package android.hardware { method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int); method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler); method public static boolean remapCoordinateSystem(float[], int, int, float[]); - method public deprecated void unregisterListener(android.hardware.SensorListener, int); method public deprecated void unregisterListener(android.hardware.SensorListener); + method public deprecated void unregisterListener(android.hardware.SensorListener, int); method public void unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor); method public void unregisterListener(android.hardware.SensorEventListener); field public static final int AXIS_MINUS_X = 129; // 0x81 @@ -12411,6 +12411,22 @@ package android.net.nsd { field public static final android.os.Parcelable.Creator CREATOR; } + public class DnsSdTxtRecord implements android.os.Parcelable { + ctor public DnsSdTxtRecord(); + ctor public DnsSdTxtRecord(byte[]); + ctor public DnsSdTxtRecord(android.net.nsd.DnsSdTxtRecord); + method public boolean contains(java.lang.String); + method public int describeContents(); + method public java.lang.String get(java.lang.String); + method public byte[] getRawData(); + method public int keyCount(); + method public int remove(java.lang.String); + method public void set(java.lang.String, java.lang.String); + method public int size(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + } + public class NsdManager { method public void deinitialize(android.net.nsd.NsdManager.Channel); method public void discoverServices(android.net.nsd.NsdManager.Channel, java.lang.String, android.net.nsd.NsdManager.DnsSdDiscoveryListener); @@ -12458,26 +12474,6 @@ package android.net.nsd { } -package android.net.nsd { - - public class DnsSdTxtRecord implements android.os.Parcelable { - ctor public DnsSdTxtRecord(); - ctor public DnsSdTxtRecord(byte[]); - ctor public DnsSdTxtRecord(android.net.nsd.DnsSdTxtRecord); - method public boolean contains(java.lang.String); - method public int describeContents(); - method public java.lang.String get(java.lang.String); - method public byte[] getRawData(); - method public int keyCount(); - method public int remove(java.lang.String); - method public void set(java.lang.String, java.lang.String); - method public int size(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - -} - package android.net.rtp { public class AudioCodec { |