diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-05-18 22:47:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-18 22:47:47 +0000 |
| commit | d5538758af0f6fea0695d3682e9aad2613ab9192 (patch) | |
| tree | 11b048c6f23dc15ce0a5ee5020017e1a57ca849a /api | |
| parent | 365f5c2e4be73382eefeb69a6d4a4aa5d60bc27d (diff) | |
| parent | 3f6405259aab3d9d5bd0a1f6dec98ad27e774f69 (diff) | |
| download | frameworks_base-d5538758af0f6fea0695d3682e9aad2613ab9192.zip frameworks_base-d5538758af0f6fea0695d3682e9aad2613ab9192.tar.gz frameworks_base-d5538758af0f6fea0695d3682e9aad2613ab9192.tar.bz2 | |
Merge "Rename file descriptor listener API." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 17 | ||||
| -rw-r--r-- | api/system-current.txt | 17 |
2 files changed, 16 insertions, 18 deletions
diff --git a/api/current.txt b/api/current.txt index d8bb56e..50147d8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23099,24 +23099,23 @@ package android.os { public final class MessageQueue { method public void addIdleHandler(android.os.MessageQueue.IdleHandler); + method public void addOnFileDescriptorEventListener(java.io.FileDescriptor, int, android.os.MessageQueue.OnFileDescriptorEventListener); method public boolean isIdle(); - method public void registerFileDescriptorCallback(java.io.FileDescriptor, int, android.os.MessageQueue.FileDescriptorCallback); method public void removeIdleHandler(android.os.MessageQueue.IdleHandler); - method public void unregisterFileDescriptorCallback(java.io.FileDescriptor); + method public void removeOnFileDescriptorEventListener(java.io.FileDescriptor); } - public static abstract class MessageQueue.FileDescriptorCallback { - ctor public MessageQueue.FileDescriptorCallback(); - method public int onFileDescriptorEvents(java.io.FileDescriptor, int); + public static abstract interface MessageQueue.IdleHandler { + method public abstract boolean queueIdle(); + } + + public static abstract interface MessageQueue.OnFileDescriptorEventListener { + method public abstract int onFileDescriptorEvents(java.io.FileDescriptor, int); field public static final int EVENT_ERROR = 4; // 0x4 field public static final int EVENT_INPUT = 1; // 0x1 field public static final int EVENT_OUTPUT = 2; // 0x2 } - public static abstract interface MessageQueue.IdleHandler { - method public abstract boolean queueIdle(); - } - public final class Messenger implements android.os.Parcelable { ctor public Messenger(android.os.Handler); ctor public Messenger(android.os.IBinder); diff --git a/api/system-current.txt b/api/system-current.txt index cd290ec..d2e0556 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25013,24 +25013,23 @@ package android.os { public final class MessageQueue { method public void addIdleHandler(android.os.MessageQueue.IdleHandler); + method public void addOnFileDescriptorEventListener(java.io.FileDescriptor, int, android.os.MessageQueue.OnFileDescriptorEventListener); method public boolean isIdle(); - method public void registerFileDescriptorCallback(java.io.FileDescriptor, int, android.os.MessageQueue.FileDescriptorCallback); method public void removeIdleHandler(android.os.MessageQueue.IdleHandler); - method public void unregisterFileDescriptorCallback(java.io.FileDescriptor); + method public void removeOnFileDescriptorEventListener(java.io.FileDescriptor); } - public static abstract class MessageQueue.FileDescriptorCallback { - ctor public MessageQueue.FileDescriptorCallback(); - method public int onFileDescriptorEvents(java.io.FileDescriptor, int); + public static abstract interface MessageQueue.IdleHandler { + method public abstract boolean queueIdle(); + } + + public static abstract interface MessageQueue.OnFileDescriptorEventListener { + method public abstract int onFileDescriptorEvents(java.io.FileDescriptor, int); field public static final int EVENT_ERROR = 4; // 0x4 field public static final int EVENT_INPUT = 1; // 0x1 field public static final int EVENT_OUTPUT = 2; // 0x2 } - public static abstract interface MessageQueue.IdleHandler { - method public abstract boolean queueIdle(); - } - public final class Messenger implements android.os.Parcelable { ctor public Messenger(android.os.Handler); ctor public Messenger(android.os.IBinder); |