Merge "Add atom definition for satellite access info" into main

service/src/com/android/metrics/stats.proto

@@ -238,8 +238,21 @@ message ConnectivityStateSample {
 
     // Full list of network details (slice by transport / meteredness / internet+validated)
     optional NetworkList networks = 4;
+
+    // Information for satellite access.
+    optional SatelliteAccessInfo satellite_access_info = 5;
 }
 
+/**
+ * Pulls information for satellite access.
+ *
+ * Pulled from:
+ *   packages/modules/Connectivity/service/src/com/android/server/ConnectivityService.java
+ */
+message SatelliteAccessInfo {
+    // Number of satellite network opt-in uids on the device.
+    optional int32 optin_uid_count = 1;
+}
 
 /**
  * Pulls information for network selection rematch info.
@@ -274,6 +287,20 @@ message DefaultNetworkRematchInfo {
 
     // The time duration the device kept the old network as the default in seconds
     optional int32 time_duration_on_old_network_sec = 5;
+
+    // Uid ranges which applied to this event.
+    optional UidRanges uid_ranges = 6;
+}
+
+message UidRanges {
+    repeated UidRange uid_range = 1;
+}
+
+// Represents a range of UIDs.
+// The range is inclusive, denoted as [begin, end].
+message UidRange {
+    optional int32 begin = 1;
+    optional int32 end = 2;
 }
 
 /**

service/src/com/android/server/ConnectivityService.java

@@ -2741,7 +2741,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 sample.getNetworkCountPerTransports().toByteArray(),
                 sample.getConnectionDurationPerTransports().toByteArray(),
                 sample.getNetworkRequestCount().toByteArray(),
-                sample.getNetworks().toByteArray());
+                sample.getNetworks().toByteArray(),
+                sample.getSatelliteAccessInfo().toByteArray());
     }
 
     /**