From a2f5b5901435dc5909027694d558d37ad06f6d62 Mon Sep 17 00:00:00 2001 From: yomna Date: Thu, 21 Mar 2024 04:52:46 +0000 Subject: [PATCH] Remove unneeded init & displayPreference functions Bug: 330336498 Test: m & atest CellularSecurityNotificationsDividerControllerTest CellularSecurityNotificationsPreferenceControllerTest CellularSecurityEncryptionDividerControllerTest CellularSecurityPreferenceControllerTest Flag: EXEMPT bugfix Change-Id: I791ad88738da24916b2c48e9b24f404707fc7047 --- ...larSecurityEncryptionDividerController.java | 18 +----------------- ...SecurityNotificationsDividerController.java | 13 ------------- ...urityNotificationsPreferenceController.java | 16 +++++----------- 3 files changed, 6 insertions(+), 41 deletions(-) diff --git a/src/com/android/settings/network/telephony/CellularSecurityEncryptionDividerController.java b/src/com/android/settings/network/telephony/CellularSecurityEncryptionDividerController.java index 6d31c72c02f..f54984703cc 100644 --- a/src/com/android/settings/network/telephony/CellularSecurityEncryptionDividerController.java +++ b/src/com/android/settings/network/telephony/CellularSecurityEncryptionDividerController.java @@ -21,7 +21,6 @@ import android.telephony.TelephonyManager; import android.util.Log; import androidx.annotation.NonNull; -import androidx.preference.PreferenceScreen; import com.android.internal.telephony.flags.FeatureFlags; import com.android.internal.telephony.flags.FeatureFlagsImpl; @@ -52,26 +51,11 @@ public class CellularSecurityEncryptionDividerController extends mTelephonyManager = mContext.getSystemService(TelephonyManager.class); } - /** - * Initialization. - */ - public CellularSecurityEncryptionDividerController init() { - return this; - } - - @Override - public void displayPreference(@NonNull PreferenceScreen screen) { - super.displayPreference(screen); - } - @Override public int getAvailabilityStatus() { if (mTelephonyManager == null) { - Log.w(LOG_TAG, - "Telephony manager not yet initialized. Marking availability as " - + "CONDITIONALLY_UNAVAILABLE"); + Log.w(LOG_TAG, "Telephony manager not yet initialized."); mTelephonyManager = mContext.getSystemService(TelephonyManager.class); - return CONDITIONALLY_UNAVAILABLE; } try { diff --git a/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java b/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java index bbe954cf0ef..8391ab5df48 100644 --- a/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java +++ b/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java @@ -24,7 +24,6 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import com.android.internal.telephony.flags.Flags; import com.android.settings.core.BasePreferenceController; @@ -55,18 +54,6 @@ public class CellularSecurityNotificationsDividerController extends mSafetyCenterManager = mContext.getSystemService(SafetyCenterManager.class); } - /** - * Initialization. - */ - public CellularSecurityNotificationsDividerController init() { - return this; - } - - @Override - public void displayPreference(@NonNull PreferenceScreen screen) { - super.displayPreference(screen); - } - @Override public int getAvailabilityStatus() { if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents() diff --git a/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java b/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java index 520e7c5aa2d..035a5b2a33b 100644 --- a/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java +++ b/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java @@ -24,7 +24,6 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import com.android.internal.telephony.flags.Flags; @@ -60,17 +59,12 @@ public class CellularSecurityNotificationsPreferenceController extends * @param subId is the subscription id * @return this instance after initialization */ - public CellularSecurityNotificationsPreferenceController init(@NonNull int subId) { + @NonNull public CellularSecurityNotificationsPreferenceController init(@NonNull int subId) { mTelephonyManager = mContext.getSystemService(TelephonyManager.class) .createForSubscriptionId(subId); return this; } - @Override - public void displayPreference(@NonNull PreferenceScreen screen) { - super.displayPreference(screen); - } - @Override public int getAvailabilityStatus(int subId) { if (!isSafetyCenterSupported()) { @@ -80,10 +74,6 @@ public class CellularSecurityNotificationsPreferenceController extends if (!areFlagsEnabled()) { return UNSUPPORTED_ON_DEVICE; } - if (mTelephonyManager == null) { - Log.w(LOG_TAG, "Telephony manager not yet initialized"); - mTelephonyManager = mContext.getSystemService(TelephonyManager.class); - } // Checking for hardware support, i.e. IRadio AIDL version must be >= 2.2 try { @@ -168,6 +158,10 @@ public class CellularSecurityNotificationsPreferenceController extends } private boolean areNotificationsEnabled() { + if (mTelephonyManager == null) { + Log.w(LOG_TAG, "Telephony manager not yet initialized"); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class); + } return mTelephonyManager.isNullCipherNotificationsEnabled() && mTelephonyManager.isCellularIdentifierDisclosureNotificationsEnabled(); }