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

Merge "Cleaned up the flag enable_modem_cipher_transparency" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-03 23:26:36 -08:00
committed by Android (Google) Code Review
parent c1163a15d6 1fd847de4a
commit 2d664f308d
6 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/CellularSecurityPreferenceController.java
View File

@@ -72,8 +72,7 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
@Override
public int getAvailabilityStatus() {
if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
|| !Flags.enableModemCipherTransparencyUnsolEvents()
|| !Flags.enableModemCipherTransparency()) {
|| !Flags.enableModemCipherTransparencyUnsolEvents()) {
return UNSUPPORTED_ON_DEVICE;
}
if (mTelephonyManager == null) {

3
src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java
View File

@@ -60,8 +60,7 @@ public class CellularSecurityNotificationsDividerController extends
@Override
public int getAvailabilityStatus() {
if (!Flags.enableModemCipherTransparencyUnsolEvents()
|| !Flags.enableModemCipherTransparency()) {
if (!Flags.enableModemCipherTransparencyUnsolEvents()) {
return UNSUPPORTED_ON_DEVICE;
}
if (!isSafetyCenterSupported()) {

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

@@ -178,8 +178,7 @@ public class CellularSecurityNotificationsPreferenceController extends
}
private boolean areFlagsEnabled() {
if (!Flags.enableModemCipherTransparencyUnsolEvents()
|| !Flags.enableModemCipherTransparency()) {
if (!Flags.enableModemCipherTransparencyUnsolEvents()) {
return false;
}
return true;