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

Commit 08322a39 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "[automerger skipped] Merge "Remove package name from SafetyNet logs"... 

Merge "[automerger skipped] Merge "Remove package name from SafetyNet logs" into qt-dev am: 2c12354e am: ca9d475b -s ours am: d307aa8b -s ours am: 98fa0f5b -s ours am: 3c6d0b80 -s ours am: c8f27550 -s ours am: d0fcd513 -s ours am: 3c67cd4b -s ours am: e7ebf980 -s ours am: 585aedc1 -s ours"
parents 6aec6707 fcd8f97c

core/java/android/os/Binder.java

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ public class Binder implements IBinder { 
    }



    /**

     * Reset the kernel binder identity of the incoming IPC on the current thread. This can

     * Reset the identity of the incoming IPC on the current thread. This can

     * be useful if, while handling an incoming call, you will be calling

     * on interfaces of other objects that may be local to your process and

     * need to do permission checks on the calls coming into them (so they
@@ -397,7 +397,7 @@ public class Binder implements IBinder { 
    public static final native long clearCallingIdentity();



    /**

     * Restore the kernel binder identity of the incoming IPC on the current thread

     * Restore the identity of the incoming IPC on the current thread

     * back to a previously identity that was returned by {@link

     * #clearCallingIdentity}.

     *