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

Commit ea94acc5 authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Tidy up power groups in dumpsys 

Bug: 376209178
Flag: EXEMPT logging changes only
Test: adb shell dumpsys power | grep "Power Group User Activity" -A10
Change-Id: I44dc503425db34a1009480e0990515ba063d7f08
parent 0b4cbfba

services/core/java/com/android/server/power/PowerGroup.java

+16 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.PowerManagerInternal; 
import android.os.PowerSaveState;

import android.os.Trace;

import android.util.Slog;

import android.util.TimeUtils;

import android.view.Display;



import com.android.internal.annotations.VisibleForTesting;
@@ -562,6 +563,21 @@ public class PowerGroup { 
        return ready;

    }



    @Override

    public String toString() {

        return "groupId: " + mGroupId

                + "\nuserActivitySummary=0x" + Integer.toHexString(mUserActivitySummary)

                + "\nmWakeLockSummary=0x" + Integer.toHexString(mWakeLockSummary)

                + "\nlastUserActivityTime=" + TimeUtils.formatUptime(mLastUserActivityTime)

                + "\nlastUserActivityTimeNoChangeLights="

                    + TimeUtils.formatUptime(mLastUserActivityTimeNoChangeLights)

                + "\nmLastWakeReason=" + mLastWakeReason

                + "\nmLastSleepReason=" + mLastSleepReason

                + "\nmDimDuration=" + mDimDuration

                + "\nmScreenOffTimeout=" + mScreenOffTimeout;

    }





    /** Determines the respective display state reason for a given PowerManager WakeReason. */

    private static int wakeReasonToDisplayStateReason(@PowerManager.WakeReason int wakeReason) {

        switch (wakeReason) {

services/core/java/com/android/server/power/PowerManagerService.java

+2 −11
Original line number Diff line number Diff line
@@ -4958,18 +4958,9 @@ public final class PowerManagerService extends SystemService 
                pw.println(profile.mLockingNotified);

            }



            pw.println("Display Group User Activity:");

            pw.println("Power Group User Activity:");

            for (int idx = 0; idx < mPowerGroups.size(); idx++) {

                final PowerGroup powerGroup = mPowerGroups.valueAt(idx);

                pw.println("  displayGroupId=" + powerGroup.getGroupId());

                pw.println("  userActivitySummary=0x" + Integer.toHexString(

                        powerGroup.getUserActivitySummaryLocked()));

                pw.println("  lastUserActivityTime=" + TimeUtils.formatUptime(

                        powerGroup.getLastUserActivityTimeLocked()));

                pw.println("  lastUserActivityTimeNoChangeLights=" + TimeUtils.formatUptime(

                        powerGroup.getLastUserActivityTimeNoChangeLightsLocked()));

                pw.println("  mWakeLockSummary=0x" + Integer.toHexString(

                        powerGroup.getWakeLockSummaryLocked()));

                pw.println(mPowerGroups.valueAt(idx).toString());

            }



            wcd = mWirelessChargerDetector;