From bd12b4476bbcade841df94dfd3c8242ccf8a0832 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 16 Mar 2018 15:58:24 -0700 Subject: Frameworks: Fix Binder.joinThreadPool Fix the lack of a native implementation. (cherry picked from commit acd1987950d54afef1f69dad11840996c22cb8fe) Bug: 75254055 Bug: 75291614 Test: atest BinderTest Merged-In: Id5b15442a59851e566a24d406a7487f9de66d42f Change-Id: Id5b15442a59851e566a24d406a7487f9de66d42f --- core/java/android/os/Binder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index 336e1b48251e..5652d6dec8a5 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -22,6 +22,7 @@ import android.util.ExceptionUtils; import android.util.Log; import android.util.Slog; +import com.android.internal.os.BinderInternal; import com.android.internal.util.FastPrintWriter; import com.android.internal.util.FunctionalUtils.ThrowingRunnable; import com.android.internal.util.FunctionalUtils.ThrowingSupplier; @@ -361,7 +362,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. -- cgit v1.2.3-59-g8ed1b