From 3f6405259aab3d9d5bd0a1f6dec98ad27e774f69 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Fri, 15 May 2015 12:26:15 -0700
Subject: Rename file descriptor listener API.

Bug: 21039493
Change-Id: I506c429e99528eb04dbda5b28da2ad000d10b467
---
 api/current.txt        | 17 ++++++++---------
 api/system-current.txt | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'api')

diff --git a/api/current.txt b/api/current.txt
index 1b2e2e0..b38d816 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23091,24 +23091,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 fe0f874..1ac4887 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24990,24 +24990,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);
-- 
cgit v1.1