diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-25 21:37:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-25 21:37:19 +0000 |
| commit | afabfa2be855d8efadabbc4a8410c9dd8d458143 (patch) | |
| tree | 5d0dde9ed1d3526acb5697fc513b44100ac44d1e /core/java/android | |
| parent | 8b3ef5ab8c406fb6294416dd843a8290c84d1c09 (diff) | |
| parent | 0b0587fd6960656d1407539130301fd313737de6 (diff) | |
Merge "Rename isHandlingTransaction to isDirectlyHandlingTransaction" am: 7eb7f9efaf am: 0a3a353ec0 am: 84dc08e004 am: 1f4f565bf0 am: 0b0587fd69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818907
Change-Id: Ib60f38d89255e3c8503ddc4e1dfdac187ecad87c
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"); } |