Merge "Stub Binder API."

am: 4db1632b3a

Change-Id: I00e7f39d525a1d6af9a07b192294060113a2f7c2

1 files changed, 11 insertions, 0 deletions

diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index ea8ba2f1e6df..50a3f4c01051 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -129,6 +129,17 @@ public class Binder implements IBinder {
         return sTransactionTracker;
     }
 
+    /** @hide */
+    public static IBinder allowBlocking(IBinder binder) {
+        // NOTE: real implementation on internal branch
+        return binder;
+    }
+
+    /** @hide */
+    public static void copyAllowBlocking(IBinder fromBinder, IBinder toBinder) {
+        // NOTE: real implementation on internal branch
+    }
+
     /* mObject is used by native code, do not remove or rename */
     private long mObject;
     private IInterface mOwner;