From 809869a8ee33190b9ef30490a5a636366b14a836 Mon Sep 17 00:00:00 2001
From: Junyu Lai <junyulai@google.com>
Date: Fri, 25 Apr 2025 15:34:06 +0800
Subject: [PATCH] Support dumpsys for SatelliteAccessController

Sample output:
SatelliteAccessController:
  Sms-Role Apps: {0={10138}}
  Opt-In Uids: {10123}

Flag: EXEMPT flagged with a kill switch
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.SatelliteAccessControllerTest \
      --update-device
Bug: 410731080
Change-Id: Ib868d61b9b1c1b5d8adde4d78b6d005a57d5526d
---
 .../com/android/server/ConnectivityService.java   |  5 +++++
 .../connectivity/SatelliteAccessController.java   | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 269d7489be..05ea6f962f 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -4557,6 +4557,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
         mPermissionMonitor.dump(pw);
         pw.decreaseIndent();
 
+        pw.println();
+        if (mSatelliteAccessController != null) {
+            mSatelliteAccessController.dump(pw);
+        }
+
         pw.println();
         pw.println("Legacy network activity:");
         pw.increaseIndent();
diff --git a/service/src/com/android/server/connectivity/SatelliteAccessController.java b/service/src/com/android/server/connectivity/SatelliteAccessController.java
index baf146f734..50edacf6f8 100644
--- a/service/src/com/android/server/connectivity/SatelliteAccessController.java
+++ b/service/src/com/android/server/connectivity/SatelliteAccessController.java
@@ -36,6 +36,7 @@ import android.util.Log;
 import android.util.SparseArray;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.net.module.util.DeviceConfigUtils;
 
 import java.util.List;
@@ -365,4 +366,18 @@ public class SatelliteAccessController {
     private boolean removeSatelliteDataOptimizedUidsForUser(int userIdToRemove) {
         return mSatelliteDataOptimizedUids.removeIf(uid -> uid / PER_USER_RANGE == userIdToRemove);
     }
+
+    /** Dump info to dumpsys */
+    public void dump(@NonNull IndentingPrintWriter pw) {
+        pw.println("SatelliteAccessController:");
+        pw.increaseIndent();
+        pw.print("Sms-Role Uids: ");
+        pw.print(mAllUsersSatelliteNetworkFallbackUidCache);
+        pw.println();
+        pw.print("Opt-In Uids: ");
+        pw.print(mSatelliteDataOptimizedUids);
+        pw.println();
+        pw.decreaseIndent();
+        pw.println();
+    }
 }