Merge "Revert "[AAPM] Add advanced protection dialog according to API f..."" into main

src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java

@@ -109,9 +109,12 @@ public class ActionDisabledByAdminDialog extends Activity
         }
         if (enforcingAdmin.getAuthority() instanceof UnknownAuthority authority
                 && ADVANCED_PROTECTION_SYSTEM_ENTITY.equals(authority.getName())) {
-            Intent apmSupportIntent = AdvancedProtectionManager
-                    .createSupportIntentForPolicyIdentifierOrRestriction(restriction,
-                            AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_UNKNOWN);
+            AdvancedProtectionManager apm = getSystemService(AdvancedProtectionManager.class);
+            if (apm == null) {
+                return;
+            }
+            Intent apmSupportIntent = apm.createSupportIntentForPolicyIdentifierOrRestriction(
+                    restriction, /* type */ null);
             startActivityAsUser(apmSupportIntent, UserHandle.of(userId));
             finish();
         } else {

src/com/android/settings/security/ActionDisabledByAdvancedProtectionDialog.kt

@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.security;
-
-import android.app.Activity
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import com.android.settings.R
-
-import androidx.appcompat.app.AlertDialog;
-
-class ActionDisabledByAdvancedProtectionDialog : Activity(), DialogInterface.OnDismissListener {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val dialogView = layoutInflater.inflate(R.layout.support_details_dialog, null) as ViewGroup
-        val builder = AlertDialog.Builder(this)
-            .setPositiveButton(R.string.okay, null)
-            .setView(dialogView)
-            .setOnDismissListener(this)
-        initializeDialogView(dialogView)
-        builder.show()
-    }
-
-    override fun onDismiss(dialog: DialogInterface) {
-        finish()
-    }
-
-    private fun initializeDialogView(dialogView: View) {
-        setSupportTitle(dialogView)
-        setSupportDetails(dialogView)
-    }
-
-    private fun setSupportTitle(root: View) {
-        val titleView: TextView = root.findViewById(R.id.admin_support_dialog_title) ?: return
-        titleView.setText(R.string.disabled_by_advanced_protection_title)
-    }
-
-    private fun setSupportDetails(root: View) {
-        val textView: TextView = root.findViewById(R.id.admin_support_msg)
-        textView.setText(R.string.disabled_by_advanced_protection_message)
-    }
-}

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() {
-        AdvancedProtectionManager.createSupportIntent(
+        aapmManager?.createSupportIntent(
             AdvancedProtectionManager.FEATURE_ID_DISALLOW_WEP,
             AdvancedProtectionManager.SUPPORT_DIALOG_TYPE_DISABLED_SETTING
-        ).let { mContext.startActivity(it) }
+        )?.let { mContext.startActivity(it) }
     }
 
     val wepAllowedFlow =