summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter Kalauskas <peskal@google.com> 2022-11-10 19:24:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-10 19:24:57 +0000
commit5f154f25fe345bf9c0e54a96f45a1bfbb7c31c28 (patch)
tree2fcb30d83c591e6f9074c562a113456b62a2ad6b
parentb048d1bbbb97344dbfae2fe993dc8a947cf82613 (diff)
parent66e5f1dac2d296902b48bc0eef27a9efa949306c (diff)
Merge "Log wtf for warn-on-blocking on eng builds" am: 66e5f1dac2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2285778 Change-Id: Ieaca8f7cd9fbb7045ea1b099a7539bca3de8d4d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/os/BinderProxy.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java
index 63306612fdaf..1929a4d562d4 100644
--- a/core/java/android/os/BinderProxy.java
+++ b/core/java/android/os/BinderProxy.java
@@ -536,8 +536,8 @@ public final class BinderProxy implements IBinder {
mWarnOnBlocking = false;
warnOnBlocking = false;
- if (Build.IS_USERDEBUG) {
- // Log this as a WTF on userdebug builds.
+ if (Build.IS_USERDEBUG || Build.IS_ENG) {
+ // Log this as a WTF on userdebug and eng builds.
Log.wtf(Binder.TAG,
"Outgoing transactions from this process must be FLAG_ONEWAY",
new Throwable());