diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-19 15:00:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-19 15:00:40 +0000 |
| commit | c597b65e96ac7b7c7114fe80016ad059ec2faec3 (patch) | |
| tree | 6cccbf15a60a6da2e959cd777b6f2b5548ab866c /core/java | |
| parent | 0911a75ea5d73f01bc1dbf2bd3a2a9eb3085a8c6 (diff) | |
| parent | e3838e88bd7f894d26048958072300b7afbf4125 (diff) | |
Merge "Remove ResourcesManager Slog.wtf"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ResourcesManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index fb2120e5a35b..1aafe2cc6350 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -825,8 +825,8 @@ public class ResourcesManager { Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, "ResourcesManager#createApkAssetsSupplierNotLocked"); try { - if (Thread.holdsLock(this)) { - Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName() + if (DEBUG && Thread.holdsLock(this)) { + Slog.w(TAG, "Calling thread " + Thread.currentThread().getName() + " is holding mLock", new Throwable()); } |