diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2282cdbda3d..b8dd331823a 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"> 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