Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fae13b29 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Frameworks: Fix Binder.joinThreadPool" 

am: 448003fc

Change-Id: I8c30b82c4317fc22a1e0ef92e0a3dc2e3b5e8710
parents 9dda91f8 448003fc

core/java/android/os/Binder.java

+4 −1
Original line number Diff line number Diff line
@@ -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.