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

Commit 32198526 authored by Kweku Adams's avatar Kweku Adams
Browse files

Updating some PowerManagerService proto messages. 

Added some extra comments.

Bug: 65750826
Test: it builds
Change-Id: I0469b636376628bb53a3d549367528b573a957c4
parent 9de94c62

core/proto/android/server/powermanagerservice.proto

+6 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import "frameworks/base/core/proto/android/server/wirelesschargerdetector.proto" 
import "frameworks/base/core/proto/android/view/display.proto";



message PowerManagerServiceDumpProto {

    // A com.android.server.power.PowerManagerService.Constants object.

    message ConstantsProto {

        optional bool is_no_cached_wake_locks = 1;

    }
@@ -49,7 +50,8 @@ message PowerManagerServiceDumpProto { 
        optional bool is_screen_dim = 2;

        optional bool is_screen_dream = 3;

    }

    message UidProto {

    // A com.android.server.power.PowerManagerService.UidState object.

    message UidStateProto {

        optional int32 uid = 1;

        optional string uid_string = 2;

        optional bool is_active = 3;
@@ -154,7 +156,7 @@ message PowerManagerServiceDumpProto { 
    // Some uids have actually changed while mUidsChanging was true.

    optional bool are_uids_changed = 45;

    // List of UIDs and their states

    repeated UidProto uids = 46;

    repeated UidStateProto uid_states = 46;

    optional .android.os.LooperProto looper = 47;

    // List of all wake locks acquired by applications.

    repeated WakeLockProto wake_locks = 48;
@@ -163,11 +165,13 @@ message PowerManagerServiceDumpProto { 
    optional WirelessChargerDetectorProto wireless_charger_detector = 50;

}



// A com.android.server.power.PowerManagerService.SuspendBlockerImpl object.

message SuspendBlockerProto {

    optional string name = 1;

    optional int32 reference_count = 2;

}



// A com.android.server.power.PowerManagerService.WakeLock object.

message WakeLockProto {

    message WakeLockFlagsProto {

        // Turn the screen on when the wake lock is acquired.

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

+7 −7
Original line number Diff line number Diff line
@@ -3702,16 +3702,16 @@ public final class PowerManagerService extends SystemService 


            for (int i = 0; i < mUidState.size(); i++) {

                final UidState state = mUidState.valueAt(i);

                final long uIDToken = proto.start(PowerManagerServiceDumpProto.UIDS);

                final long uIDToken = proto.start(PowerManagerServiceDumpProto.UID_STATES);

                final int uid = mUidState.keyAt(i);

                proto.write(PowerManagerServiceDumpProto.UidProto.UID, uid);

                proto.write(PowerManagerServiceDumpProto.UidProto.UID_STRING, UserHandle.formatUid(uid));

                proto.write(PowerManagerServiceDumpProto.UidProto.IS_ACTIVE, state.mActive);

                proto.write(PowerManagerServiceDumpProto.UidProto.NUM_WAKE_LOCKS, state.mNumWakeLocks);

                proto.write(PowerManagerServiceDumpProto.UidStateProto.UID, uid);

                proto.write(PowerManagerServiceDumpProto.UidStateProto.UID_STRING, UserHandle.formatUid(uid));

                proto.write(PowerManagerServiceDumpProto.UidStateProto.IS_ACTIVE, state.mActive);

                proto.write(PowerManagerServiceDumpProto.UidStateProto.NUM_WAKE_LOCKS, state.mNumWakeLocks);

                if (state.mProcState == ActivityManager.PROCESS_STATE_UNKNOWN) {

                    proto.write(PowerManagerServiceDumpProto.UidProto.IS_PROCESS_STATE_UNKNOWN, true);

                    proto.write(PowerManagerServiceDumpProto.UidStateProto.IS_PROCESS_STATE_UNKNOWN, true);

                } else {

                    proto.write(PowerManagerServiceDumpProto.UidProto.PROCESS_STATE,

                    proto.write(PowerManagerServiceDumpProto.UidStateProto.PROCESS_STATE,

                            ActivityManager.processStateAmToProto(state.mProcState));

                }

                proto.end(uIDToken);