Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev

am: 0f8f3f25cf Change-Id: Ib537886c003f4f4877a1fb4a89ad9ca25f603aea
2018-03-20 00:27:23 +00:00
parent 7bec751fe6 0f8f3f25cf
commit 1833e68f13
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -376,7 +376,9 @@ public class Binder implements IBinder {
     * Add the calling thread to the IPC thread pool.  This function does
     * not return until the current process is exiting.
     */
-    public static final native void joinThreadPool();
+    public static final void joinThreadPool() {
+        BinderInternal.joinThreadPool();
+    }

    /**
     * Returns true if the specified interface is a proxy.