From e3838e88bd7f894d26048958072300b7afbf4125 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Tue, 18 Aug 2020 21:43:28 +0000 Subject: [PATCH] Remove ResourcesManager Slog.wtf LoadedApk.updateApplicationInfo can call getResources while holding the ResourcesManager lock. Remove the wtf and replace it wuth a debug warning. Bug: 165367316 Change-Id: I734688edd4e1d218fd0e2438b47ee05e477aa79f Test: presubmit --- core/java/android/app/ResourcesManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index fb2120e5a35bf..1aafe2cc63508 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()); }