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

Commit 4e0d3075 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Only emit debug logging when requested. 

Test: builds, boots
Bug: 72556865
Change-Id: I69d5d760221ef907eeea38490f56243f0a3b9dcb
parent 6b10cbd0

core/java/android/util/RecurrenceRule.java

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.Objects; 
 */

public class RecurrenceRule implements Parcelable {

    private static final String TAG = "RecurrenceRule";

    private static final boolean DEBUG = true;

    private static final boolean LOGD = Log.isLoggable(TAG, Log.DEBUG);



    private static final int VERSION_INIT = 0;
@@ -192,7 +192,7 @@ public class RecurrenceRule implements Parcelable { 
        public RecurringIterator() {

            final ZonedDateTime anchor = (end != null) ? end

                    : ZonedDateTime.now(sClock).withZoneSameInstant(start.getZone());

            if (DEBUG) Log.d(TAG, "Resolving using anchor " + anchor);

            if (LOGD) Log.d(TAG, "Resolving using anchor " + anchor);



            updateCycle();
@@ -231,7 +231,7 @@ public class RecurrenceRule implements Parcelable { 


        @Override

        public Pair<ZonedDateTime, ZonedDateTime> next() {

            if (DEBUG) Log.d(TAG, "Cycle " + i + " from " + cycleStart + " to " + cycleEnd);

            if (LOGD) Log.d(TAG, "Cycle " + i + " from " + cycleStart + " to " + cycleEnd);

            Pair<ZonedDateTime, ZonedDateTime> p = new Pair<>(cycleStart, cycleEnd);

            i--;

            updateCycle();

services/core/java/com/android/server/net/NetworkStatsService.java

+5 −4
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ import java.util.List; 
 */

public class NetworkStatsService extends INetworkStatsService.Stub {

    static final String TAG = "NetworkStats";

    static final boolean LOGV = false;

    static final boolean LOGD = Log.isLoggable(TAG, Log.DEBUG);

    static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);



    private static final int MSG_PERFORM_POLL = 1;

    private static final int MSG_UPDATE_IFACES = 2;
@@ -641,14 +642,14 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        if ((flags & NetworkStatsManager.FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN) != 0

                && (template.getMatchRule() == NetworkTemplate.MATCH_MOBILE_ALL)

                && mSettings.getAugmentEnabled()) {

            Slog.d(TAG, "Resolving plan for " + template);

            if (LOGD) Slog.d(TAG, "Resolving plan for " + template);

            final long token = Binder.clearCallingIdentity();

            try {

                final SubscriptionManager sm = mContext.getSystemService(SubscriptionManager.class);

                final TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);

                for (int subId : sm.getActiveSubscriptionIdList()) {

                    if (template.matchesSubscriberId(tm.getSubscriberId(subId))) {

                        Slog.d(TAG, "Found active matching subId " + subId);

                        if (LOGD) Slog.d(TAG, "Found active matching subId " + subId);

                        final List<SubscriptionPlan> plans = sm.getSubscriptionPlans(subId);

                        if (!plans.isEmpty()) {

                            plan = plans.get(0);
@@ -658,7 +659,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
            } finally {

                Binder.restoreCallingIdentity(token);

            }

            Slog.d(TAG, "Resolved to plan " + plan);

            if (LOGD) Slog.d(TAG, "Resolved to plan " + plan);

        }

        return plan;

    }