Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4d969c1 authored by Azhara Assanova's avatar Azhara Assanova Committed by Android (Google) Code Review
Browse files

Merge "Fix displaying advanced protection dialog on top of the Wi-Fi quick tile" into main

parents 4d98b4fd 3795e1e3

core/java/android/security/advancedprotection/AdvancedProtectionManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.kt

+1 −0
Original line number Diff line number Diff line
@@ -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()