Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd09a63 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

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

parents 39413173 c73bfe32

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

+5 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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;