From a50dd92e49aa90287f55c1ec6a98dc2b9d810c7f Mon Sep 17 00:00:00 2001
From: tomhsu <tomhsu@google.com>
Date: Thu, 9 May 2024 06:16:34 +0000
Subject: [PATCH] Expose SatelliteWarningDialogActivity

Bug: 337154438
Test: Manual test
Test: Build pass
Change-Id: I530c554433d99b4732416b8f1b83677ddc0ff6d8
---
 AndroidManifest.xml                                         | 3 ++-
 .../settings/network/SatelliteWarningDialogActivity.kt      | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index daadd35d213..ad815516c61 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5190,7 +5190,8 @@
             android:name="com.android.settings.network.SatelliteWarningDialogActivity"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
             android:excludeFromRecents="true"
-            android:exported="false"
+            android:exported="true"
+            android:permission="android.permission.NETWORK_SETTINGS"
             android:theme="@style/Theme.SpaLib.Dialog">
         </activity>
 
diff --git a/src/com/android/settings/network/SatelliteWarningDialogActivity.kt b/src/com/android/settings/network/SatelliteWarningDialogActivity.kt
index 0702e4fbc66..3f1d416951d 100644
--- a/src/com/android/settings/network/SatelliteWarningDialogActivity.kt
+++ b/src/com/android/settings/network/SatelliteWarningDialogActivity.kt
@@ -27,6 +27,7 @@ import com.android.settings.R
 import com.android.settingslib.spa.SpaDialogWindowTypeActivity
 import com.android.settingslib.spa.widget.dialog.AlertDialogButton
 import com.android.settingslib.spa.widget.dialog.SettingsAlertDialogContent
+import com.android.settingslib.wifi.WifiUtils
 
 /** A dialog to show the warning message when device is under satellite mode. */
 class SatelliteWarningDialogActivity : SpaDialogWindowTypeActivity() {
@@ -41,7 +42,10 @@ class SatelliteWarningDialogActivity : SpaDialogWindowTypeActivity() {
     }
 
     override fun getDialogWindowType(): Int {
-        return WindowManager.LayoutParams.LAST_APPLICATION_WINDOW
+        return intent.getIntExtra(
+            WifiUtils.DIALOG_WINDOW_TYPE,
+            WindowManager.LayoutParams.LAST_APPLICATION_WINDOW
+        )
     }
 
     @Composable