commit ad83f87bcfc4f3ee4bcc972bad4ddcaaf4e57426
author Wale Ogunwale <ogunwale@google.com> Wed Apr 15 17:38:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 15 17:38:17 2015 +0000
tree 4c10d36e8c81f902a46fe34f54a2c33e989f6cf4
parent 47af53ed95070063f5ec299b957420a91fcd5292
parent 8d90634aab535aaaf1e7e187fee6f7c0d6957625

Merge "@hide Binder#blockUntilThreadAvailable API"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e9d165d..8f87163 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22500,7 +22500,6 @@
   public class Binder implements android.os.IBinder {
     ctor public Binder();
     method public void attachInterface(android.os.IInterface, java.lang.String);
-    method public static final void blockUntilThreadAvailable();
     method public static final long clearCallingIdentity();
     method public void dump(java.io.FileDescriptor, java.lang.String[]);
     method protected void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 0cc8d31..a9a5211 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24388,7 +24388,6 @@
   public class Binder implements android.os.IBinder {
     ctor public Binder();
     method public void attachInterface(android.os.IInterface, java.lang.String);
-    method public static final void blockUntilThreadAvailable();
     method public static final long clearCallingIdentity();
     method public void dump(java.io.FileDescriptor, java.lang.String[]);
     method protected void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

core/java/android/os/Binder.java

diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index b77b82cd..64562a4 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -189,6 +189,7 @@
     /**
      * Call blocks until the number of executing binder threads is less
      * than the maximum number of binder threads allowed for this process.
+     * @hide
      */
     public static final native void blockUntilThreadAvailable();