From 1fd847de4aaa4a085421f939a55693524294e8d8 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Thu, 30 Jan 2025 23:33:35 -0800 Subject: [PATCH] Cleaned up the flag enable_modem_cipher_transparency Cleaned up the 24Q3 flag enable_modem_cipher_transparency Bug: 283336425 Test: Basic telephony functionality tests Test: atest FrameworksTelephonyTests Flag: EXEMPT removing flag Change-Id: Ibdb3613d4633535a2d855cc0383c05315ef4e890 --- .../settings/network/CellularSecurityPreferenceController.java | 3 +-- .../CellularSecurityNotificationsDividerController.java | 3 +-- .../CellularSecurityNotificationsPreferenceController.java | 3 +-- .../network/CellularSecurityPreferenceControllerTest.java | 2 -- .../CellularSecurityNotificationsDividerControllerTest.java | 2 -- .../CellularSecurityNotificationsPreferenceControllerTest.java | 2 -- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/network/CellularSecurityPreferenceController.java b/src/com/android/settings/network/CellularSecurityPreferenceController.java index b36e35c15c5..6ab32e31729 100644 --- a/src/com/android/settings/network/CellularSecurityPreferenceController.java +++ b/src/com/android/settings/network/CellularSecurityPreferenceController.java @@ -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) { diff --git a/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java b/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java index 4ff92abaee3..8d498e2619c 100644 --- a/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java +++ b/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java @@ -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()) { diff --git a/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java b/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java index b7325260e2e..6b18f3c4b18 100644 --- a/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java +++ b/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java @@ -178,8 +178,7 @@ public class CellularSecurityNotificationsPreferenceController extends } private boolean areFlagsEnabled() { - if (!Flags.enableModemCipherTransparencyUnsolEvents() - || !Flags.enableModemCipherTransparency()) { + if (!Flags.enableModemCipherTransparencyUnsolEvents()) { return false; } return true; diff --git a/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java index 3e6ca5091c8..05ca990e789 100644 --- a/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java @@ -136,10 +136,8 @@ public final class CellularSecurityPreferenceControllerTest { private void enableFlags(boolean enabled) { if (enabled) { - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY); } else { mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY); } } } diff --git a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java index 9bd25f4fcf3..516c1970d0b 100644 --- a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java @@ -114,10 +114,8 @@ public class CellularSecurityNotificationsDividerControllerTest { private void enableFlags(boolean enabled) { if (enabled) { mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY); } else { mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY); } } } diff --git a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java index 7d9ff9e73b2..fd67b7219f6 100644 --- a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java @@ -217,10 +217,8 @@ public class CellularSecurityNotificationsPreferenceControllerTest { private void enableFlags(boolean enabled) { if (enabled) { mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY); } else { mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY); } } }