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

Merge "Remove unneeded init & displayPreference functions" into main

Browse Source
This commit is contained in:
Yomna Nasser
2024-06-04 16:36:13 +00:00
committed by Android (Google) Code Review
parent b300ecff43 a2f5b59014
commit 23377dcf4c
3 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/network/telephony/CellularSecurityEncryptionDividerController.java
View File

@@ -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 {

13
src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.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;
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()

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