summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter Kalauskas <peskal@google.com> 2022-11-10 20:08:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-10 20:08:58 +0000
commit704774269ab6e64a63800901e2eaebc3244cb0f0 (patch)
treecf4d10f951cc89d0116625b4e30b33adc00497ff
parent425d49fe25801ee87999277dfefabe93f99f6acf (diff)
parent5f154f25fe345bf9c0e54a96f45a1bfbb7c31c28 (diff)
Merge "Log wtf for warn-on-blocking on eng builds" am: 66e5f1dac2 am: 5f154f25fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2285778 Change-Id: I58dc06253115900725321730cd57889896c42273 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());