From c73bfe321195e9641fe2d176a1798ae13c543124 Mon Sep 17 00:00:00 2001
From: Xiaowen Lei <xilei@google.com>
Date: Fri, 7 Oct 2022 00:09:37 +0000
Subject: Add/update access method/level for mTag and shouldLog().

So that these can be accessed in the inheriting classes.

Also some minor addition/updates to the logging messages.

Bug: 249826718
Test: manual
Test: atest TimeoutToUserZeroMediaConditionTest
Change-Id: Ic49084e5ea826ce4021f58a2075f4339c5344faf
---
 .../SystemUI/src/com/android/systemui/util/condition/Condition.java | 6 +++++-
 .../SystemUI/src/com/android/systemui/util/condition/Monitor.java   | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/util/condition/Condition.java b/packages/SystemUI/src/com/android/systemui/util/condition/Condition.java
index db35437e77b9..81dfc14b905e 100644
--- a/packages/SystemUI/src/com/android/systemui/util/condition/Condition.java
+++ b/packages/SystemUI/src/com/android/systemui/util/condition/Condition.java
@@ -132,10 +132,14 @@ public abstract class Condition implements CallbackController<Condition.Callback
         return mIsConditionMet;
     }
 
-    private boolean shouldLog() {
+    protected final boolean shouldLog() {
         return Log.isLoggable(mTag, Log.DEBUG);
     }
 
+    protected final String getTag() {
+        return mTag;
+    }
+
     /**
      * Callback that receives updates about whether the condition has been fulfilled.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/util/condition/Monitor.java b/packages/SystemUI/src/com/android/systemui/util/condition/Monitor.java
index dac8a0bff28a..bdc73068bc38 100644
--- a/packages/SystemUI/src/com/android/systemui/util/condition/Monitor.java
+++ b/packages/SystemUI/src/com/android/systemui/util/condition/Monitor.java
@@ -113,6 +113,7 @@ public class Monitor {
         final SubscriptionState state = new SubscriptionState(subscription);
 
         mExecutor.execute(() -> {
+            if (shouldLog()) Log.d(mTag, "adding subscription");
             mSubscriptions.put(token, state);
 
             // Add and associate conditions.
@@ -139,7 +140,7 @@ public class Monitor {
      */
     public void removeSubscription(@NotNull Subscription.Token token) {
         mExecutor.execute(() -> {
-            if (shouldLog()) Log.d(mTag, "removing callback");
+            if (shouldLog()) Log.d(mTag, "removing subscription");
             if (!mSubscriptions.containsKey(token)) {
                 Log.e(mTag, "subscription not present:" + token);
                 return;
-- 
cgit v1.2.3-59-g8ed1b