PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded init & displayPreference functions

Browse Source 
Bug: 330336498
Test: m & atest CellularSecurityNotificationsDividerControllerTest CellularSecurityNotificationsPreferenceControllerTest CellularSecurityEncryptionDividerControllerTest CellularSecurityPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I791ad88738da24916b2c48e9b24f404707fc7047
This commit is contained in:
yomna
2024-03-21 04:52:46 +00:00
parent cc10abe1c2
commit a2f5b59014
3 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java
View File

@@ -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();
}