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

Commit 224208cd authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Removing EXPLICT tag from Batterystats metric names." into... 

Merge "Merge "Removing EXPLICT tag from Batterystats metric names." into pi-dev am: 9d06b102" into pi-dev-plus-aosp
parents f246adaa 8e6c62be

core/proto/android/os/batterystats.proto

+5 −15
Original line number Original line Diff line number Diff line
@@ -641,9 +641,7 @@ message UidProto { 
  message Job {

  message Job {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;

    option (android.msg_privacy).dest = DEST_AUTOMATIC;





    optional string name = 1 [

    optional string name = 1;

        (android.privacy).dest = DEST_EXPLICIT

    ];

    // Job times aren't apportioned.

    // Job times aren't apportioned.

    optional TimerProto total = 2;

    optional TimerProto total = 2;

    optional TimerProto background = 3;

    optional TimerProto background = 3;
@@ -654,9 +652,7 @@ message UidProto { 
    option (android.msg_privacy).dest = DEST_AUTOMATIC;

    option (android.msg_privacy).dest = DEST_AUTOMATIC;





    // Job name.

    // Job name.

    optional string name = 1 [

    optional string name = 1;

        (android.privacy).dest = DEST_EXPLICIT

    ];





    message ReasonCount {

    message ReasonCount {

      option (android.msg_privacy).dest = DEST_AUTOMATIC;

      option (android.msg_privacy).dest = DEST_AUTOMATIC;
@@ -801,9 +797,7 @@ message UidProto { 
  message Sync {

  message Sync {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;

    option (android.msg_privacy).dest = DEST_AUTOMATIC;





    optional string name = 1 [

    optional string name = 1;

        (android.privacy).dest = DEST_EXPLICIT

    ];

    // Sync times aren't apportioned.

    // Sync times aren't apportioned.

    optional TimerProto total = 2;

    optional TimerProto total = 2;

    optional TimerProto background = 3;

    optional TimerProto background = 3;
@@ -842,9 +836,7 @@ message UidProto { 
  message Wakelock {

  message Wakelock {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;

    option (android.msg_privacy).dest = DEST_AUTOMATIC;





    optional string name = 1 [

    optional string name = 1;

        (android.privacy).dest = DEST_EXPLICIT

    ];





    // Full wakelocks keep the screen on. Based on

    // Full wakelocks keep the screen on. Based on

    // PowerManager.SCREEN_BRIGHT_WAKE_LOCK (deprecated in API 13) and

    // PowerManager.SCREEN_BRIGHT_WAKE_LOCK (deprecated in API 13) and
@@ -876,9 +868,7 @@ message UidProto { 
    option (android.msg_privacy).dest = DEST_AUTOMATIC;

    option (android.msg_privacy).dest = DEST_AUTOMATIC;





    // Wakeup alarm name.

    // Wakeup alarm name.

    optional string name = 1 [

    optional string name = 1;

        (android.privacy).dest = DEST_EXPLICIT

    ];

    // Only includes counts when screen-off (& on battery).

    // Only includes counts when screen-off (& on battery).

    optional int32 count = 2;

    optional int32 count = 2;

  }

  }