Merge "Add atoms to track cold/warm process start per action type" into tm-dev
diff --git a/stats/atoms.proto b/stats/atoms.proto
index 66c1672..8b4fbb7 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -3161,6 +3161,16 @@
     // session for the same remote device.
     // Default: 0 if the device's metric id is unknown.
     optional int32 metric_id = 8;
+    // A flag indicating if the MAC address of the remote device is public or
+    // random.
+    optional android.bluetooth.AddressTypeEnum address_type = 9;
+    // The first byte of MAC address
+    optional int32 byte1 = 10;
+    // The second byte of MAC address
+    optional int32 byte2 = 11;
+    // The third byte of MAC address
+    optional int32 byte3 = 12;
+
 }
 
 /**
@@ -7490,6 +7500,9 @@
     // GPU memory usage as measured by the kernel tracepoints
     // Equivalent to dumpsys gpu --gpumem
     optional int32 gpu_memory_kb = 9;
+
+    // Whether or not this process is hosting one or more foregound services.
+    optional bool has_foreground_services = 10;
 }
 
 /*
@@ -18407,6 +18420,9 @@
 
     // The last known RSS (in kB) of the process before it dies, could be 0.
     optional int32 rss = 7;
+
+    // Whether or not this process is hosting one or more foregound services.
+    optional bool has_foreground_services = 8;
 }
 
 /**
@@ -20060,6 +20076,7 @@
     optional int32 package_id = 3;
     optional int64 latency_in_millis = 4;
     optional int32 type = 5;
+    optional int32 query_length = 6 [default = -1];
 }
 
 /*
diff --git a/stats/enums/bluetooth/enums.proto b/stats/enums/bluetooth/enums.proto
index 183a029..66b4371 100644
--- a/stats/enums/bluetooth/enums.proto
+++ b/stats/enums/bluetooth/enums.proto
@@ -196,3 +196,10 @@
         A2DP_CONNECTION_TIMEOUT = 102009;
 
 }
+
+enum AddressTypeEnum {
+    ADDRESS_TYPE_PUBLIC = 0;
+    ADDRESS_TYPE_RANDOM = 1;
+    ADDRESS_TYPE_UNKNOWN = 0xFFFF;
+}
+