Merge "Add/update access method/level for mTag and shouldLog()." into tm-qpr-dev am: dfd09a6369

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20134966

Change-Id: I88ebd1f4702f11d97ca5b01837c65885fcbfa2e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/util/condition/Condition.java

@@ -172,10 +172,14 @@ public abstract class Condition implements CallbackController<Condition.Callback
         return Boolean.TRUE.equals(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.
      */

packages/SystemUI/src/com/android/systemui/util/condition/Monitor.java

@@ -117,6 +117,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.
@@ -143,7 +144,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;