diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-25 20:48:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-25 20:48:17 +0000 |
| commit | 84dc08e004f7d10e6d70da6d16e03e97fe34fbfd (patch) | |
| tree | 64f25b0d9df540005066dbc818dc480e7be45ea0 /core/java/android | |
| parent | d179f2e7b6be6e9c83733a740d262642abedf772 (diff) | |
| parent | 0a3a353ec06a8af52d458f687c5a5c3de4ddc467 (diff) | |
Merge "Rename isHandlingTransaction to isDirectlyHandlingTransaction" am: 7eb7f9efaf am: 0a3a353ec0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818907
Change-Id: Ibc4b7039bc0c16adf01c9c3694d31a62e26b07f7
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Binder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index 635f58182b34..b677b6900d5c 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -313,7 +313,7 @@ public class Binder implements IBinder { * @hide */ @CriticalNative - public static final native boolean isHandlingTransaction(); + public static final native boolean isDirectlyHandlingTransaction(); /** * Return the Linux uid assigned to the process that sent the transaction @@ -323,7 +323,7 @@ public class Binder implements IBinder { * executing an incoming transaction. */ public static final int getCallingUidOrThrow() { - if (!isHandlingTransaction()) { + if (!isDirectlyHandlingTransaction()) { throw new IllegalStateException( "Thread is not in a binder transcation"); } |