Merge "[AAPM] Add advanced protection dialog according to API feedback" into main

2024-12-19 09:41:27 -08:00
parent aea33ee8d2 e2248f1c4f
commit f2f9874122
7 changed files with 100 additions and 22 deletions
--- a/src/com/android/settings/wifi/WepNetworksPreferenceController.kt
+++ b/src/com/android/settings/wifi/WepNetworksPreferenceController.kt
@@ -162,10 +162,10 @@ class WepNetworksPreferenceController(context: Context, preferenceKey: String) :
        emit(aapmManager?.isAdvancedProtectionEnabled ?: false) }.flowOn(Dispatchers.Default)

    private fun startSupportIntent() {
-        aapmManager?.createSupportIntent(
+        AdvancedProtectionManager.createSupportIntent(
            AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP,
            AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_DISABLED_SETTING
-        )?.let { mContext.startActivity(it) }
+        ).let { mContext.startActivity(it) }
    }

    val wepAllowedFlow =