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

Commit ce9fbb5d authored by Matt Gilbride's avatar Matt Gilbride Committed by Automerger Merge Worker
Browse files

Merge "Remove stack trace from Binder#getCallingUidOrWtf" am: 6d040060 am: 680c176d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2380512



Change-Id: Iea9e6f5c29684640bd9e57045ca6e3642d9752ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 186c333e 680c176d

core/java/android/os/Binder.java

+4 −4
Original line number Diff line number Diff line
@@ -358,16 +358,16 @@ public class Binder implements IBinder { 
     * Return the Linux UID assigned to the process that sent the transaction

     * currently being processed.

     *

     * Logs WTF if the current thread is not currently

     * Slog.wtf if the current thread is not currently

     * executing an incoming transaction and the calling identity has not been

     * explicitly set with {@link #clearCallingIdentity()}

     *

     * @hide

     */

    public static final int getCallingUidOrWtf() {

    public static final int getCallingUidOrWtf(String message) {

        if (!isDirectlyHandlingTransaction() && !hasExplicitIdentity()) {

            Log.wtfStack(TAG,

                    "Thread is not in a binder transaction, "

            Slog.wtf(TAG,

                    message + ": Thread is not in a binder transaction, "

                            + "and the calling identity has not been "

                            + "explicitly set with clearCallingIdentity");

        }