Expose SatelliteWarningDialogActivity
Bug: 337154438
Test: Manual test
Test: Build pass
Change-Id: I530c554433d99b4732416b8f1b83677ddc0ff6d8
Merged-In: I530c554433d99b4732416b8f1b83677ddc0ff6d8
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2282cdb..b8dd331 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5146,7 +5146,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 0702e4f..3f1d416 100644
--- a/src/com/android/settings/network/SatelliteWarningDialogActivity.kt
+++ b/src/com/android/settings/network/SatelliteWarningDialogActivity.kt
@@ -27,6 +27,7 @@
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 @@
}
override fun getDialogWindowType(): Int {
- return WindowManager.LayoutParams.LAST_APPLICATION_WINDOW
+ return intent.getIntExtra(
+ WifiUtils.DIALOG_WINDOW_TYPE,
+ WindowManager.LayoutParams.LAST_APPLICATION_WINDOW
+ )
}
@Composable