From 3e071f055e44866885d6b6dbb4720e70932b4105 Mon Sep 17 00:00:00 2001
From: yomna <yomna@google.com>
Date: Fri, 31 Jan 2025 01:11:52 +0000
Subject: [PATCH] Fix missing controller key and remove onCreatePreferences

1) A missing controller key for CellularSecurityEncryptionDividerController
was causing the corresponding UI element's getAvailabilityStatus to not
be called. 2) The inclusion of onCreatePreferences in
CellularSecuritySettingsFragment was causing other UI element's
controllers to not be called correctly.

Bug: b/373942609
Test: atest CellularSecurityPreferenceControllerTest
Test: atest CellularSecurityEncryptionDividerControllerTest
Flag: EXEMPT bugfix
Change-Id: Ic01a609311d7bd84ee835ffbede793fe2d7756ae
---
 res/xml/cellular_security.xml                              | 3 ++-
 .../telephony/CellularSecuritySettingsFragment.java        | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/res/xml/cellular_security.xml b/res/xml/cellular_security.xml
index dde152db071..ba328804d97 100644
--- a/res/xml/cellular_security.xml
+++ b/res/xml/cellular_security.xml
@@ -20,7 +20,7 @@
     android:title="@string/cellular_security_settings_title">
 
     <com.android.settingslib.widget.TopIntroPreference
-	android:key="cellular_security_prefs_top_intro"
+        android:key="cellular_security_prefs_top_intro"
         android:title="@string/cellular_security_top_intro"/>
     <PreferenceCategory
         android:key="cellular_security_notifications_category"
@@ -34,6 +34,7 @@
                 "com.android.settings.network.telephony.CellularSecurityNotificationsPreferenceController"/>
     </PreferenceCategory>
     <PreferenceCategory
+      android:key="cellular_security_encryption_divider"
       android:title="@string/cellular_security_settings_encryption_title"
       settings:controller="com.android.settings.network.telephony.CellularSecurityEncryptionDividerController">
         <SwitchPreferenceCompat
diff --git a/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java b/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java
index 20385b93fc0..22e6f5f74a7 100644
--- a/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java
+++ b/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java
@@ -16,7 +16,6 @@
 package com.android.settings.network.telephony;
 
 import android.app.settings.SettingsEnums;
-import android.os.Bundle;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -44,10 +43,4 @@ public class CellularSecuritySettingsFragment extends DashboardFragment {
     protected int getPreferenceScreenResId() {
         return R.xml.cellular_security;
     }
-
-    @Override
-    public void onCreatePreferences(Bundle bundle, String rootKey) {
-        super.onCreatePreferences(bundle, rootKey);
-        setPreferencesFromResource(R.xml.cellular_security, rootKey);
-    }
 }