diff options
| -rw-r--r-- | core/java/android/security/advancedprotection/AdvancedProtectionManager.java | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/security/advancedprotection/AdvancedProtectionManager.java b/core/java/android/security/advancedprotection/AdvancedProtectionManager.java index 770e234381c4..0b2239aa42b2 100644 --- a/core/java/android/security/advancedprotection/AdvancedProtectionManager.java +++ b/core/java/android/security/advancedprotection/AdvancedProtectionManager.java @@ -57,6 +57,7 @@ import java.util.concurrent.Executor; @SystemService(Context.ADVANCED_PROTECTION_SERVICE) public final class AdvancedProtectionManager { private static final String TAG = "AdvancedProtectionMgr"; + private static final String PKG_SETTINGS = "com.android.settings"; //TODO(b/378931989): Switch to android.app.admin.DevicePolicyIdentifiers.MEMORY_TAGGING_POLICY //when the appropriate flag is launched. @@ -343,6 +344,7 @@ public final class AdvancedProtectionManager { } Intent intent = new Intent(ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG); + intent.setPackage(PKG_SETTINGS); intent.setFlags(FLAG_ACTIVITY_NEW_TASK); intent.putExtra(EXTRA_SUPPORT_DIALOG_FEATURE, featureId); intent.putExtra(EXTRA_SUPPORT_DIALOG_TYPE, type); diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt index 88bccc9f6ebd..2ed437c94439 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt @@ -509,6 +509,7 @@ open class WifiUtils { val intent = AdvancedProtectionManager.createSupportIntent( AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP, AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_BLOCKED_INTERACTION) + intent.putExtra(DIALOG_WINDOW_TYPE, dialogWindowType) onStartActivity(intent) } else if (wifiManager.isWepSupported == true && wifiManager.queryWepAllowed()) { onAllowed() |