commit c0c464091a15b883336a7808111c035ff6cf3109
author Zaiyue Xue <xuezaiyue@google.com> Tue Nov 28 05:24:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 28 05:24:45 2023 +0000
tree 95369ca6e28fb855d6edf9a00b7f82ccceafd49a
parent a9823c4ea34f38ac0a5c1b0a6333ad1ba764860c
parent 7ee22f9e305898dd1303d7a31e496ed6243a246e

Merge "Add usage time for process state for UidBatteryConsumer atom proto" into main

core/proto/android/os/batteryusagestats.proto

diff --git a/core/proto/android/os/batteryusagestats.proto b/core/proto/android/os/batteryusagestats.proto
index 2b74220..11b367b 100644
--- a/core/proto/android/os/batteryusagestats.proto
+++ b/core/proto/android/os/batteryusagestats.proto
@@ -92,8 +92,24 @@
     message UidBatteryConsumer {
         optional int32 uid = 1;
         optional BatteryConsumerData battery_consumer_data = 2;
-        optional int64 time_in_foreground_millis = 3;
-        optional int64 time_in_background_millis = 4;
+        // DEPRECATED Use time_in_state instead.
+        optional int64 time_in_foreground_millis = 3 [deprecated = true];
+        // DEPRECATED Use time_in_state instead.
+        optional int64 time_in_background_millis = 4 [deprecated = true];
+
+        message TimeInState {
+            enum ProcessState {
+                UNSPECIFIED = 0;
+                FOREGROUND = 1;
+                BACKGROUND = 2;
+                FOREGROUND_SERVICE = 3;
+            }
+
+            optional ProcessState process_state = 1;
+            optional int64 time_in_state_millis = 2;
+        }
+
+        repeated TimeInState time_in_state = 5;
     }
     repeated UidBatteryConsumer uid_battery_consumers = 5;