From a8db4d190e2f6b0a10702d3e6e87d51e619fd3fc Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Fri, 7 Feb 2025 15:41:18 -0800 Subject: [PATCH] Removed the flag enable_modem_cipher_transparency_unsol_events Removed the 24Q3 flag enable_modem_cipher_transparency_unsol_events Bug: 283336425 Test: atest FrameworksTelephonyTests Test: Basic telephony functionality tests Flag: EXEMPT flag cleanup Change-Id: I08e206d721f99f9422a117dbe009561b434a43bf --- .../CellularSecurityPreferenceController.java | 4 +-- ...ecurityNotificationsDividerController.java | 4 --- ...rityNotificationsPreferenceController.java | 21 --------------- ...lularSecurityPreferenceControllerTest.java | 19 -------------- ...ityNotificationsDividerControllerTest.java | 20 -------------- ...NotificationsPreferenceControllerTest.java | 26 ------------------- 6 files changed, 1 insertion(+), 93 deletions(-) diff --git a/src/com/android/settings/network/CellularSecurityPreferenceController.java b/src/com/android/settings/network/CellularSecurityPreferenceController.java index 6ab32e31729..9ad2eac4ac0 100644 --- a/src/com/android/settings/network/CellularSecurityPreferenceController.java +++ b/src/com/android/settings/network/CellularSecurityPreferenceController.java @@ -35,7 +35,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.internal.telephony.flags.Flags; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; import com.android.settings.network.telephony.CellularSecuritySettingsFragment; @@ -71,8 +70,7 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll @Override public int getAvailabilityStatus() { - if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY) - || !Flags.enableModemCipherTransparencyUnsolEvents()) { + if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { 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 8d498e2619c..4d1ee878239 100644 --- a/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java +++ b/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java @@ -26,7 +26,6 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import com.android.internal.telephony.flags.Flags; import com.android.settings.core.BasePreferenceController; import com.android.settings.network.SubscriptionUtil; @@ -60,9 +59,6 @@ public class CellularSecurityNotificationsDividerController extends @Override public int getAvailabilityStatus() { - if (!Flags.enableModemCipherTransparencyUnsolEvents()) { - return UNSUPPORTED_ON_DEVICE; - } if (!isSafetyCenterSupported()) { return UNSUPPORTED_ON_DEVICE; } diff --git a/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java b/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java index 6b18f3c4b18..347f95b50f3 100644 --- a/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java +++ b/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java @@ -26,7 +26,6 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import com.android.internal.telephony.flags.Flags; import com.android.settings.network.SubscriptionUtil; import java.util.List; @@ -75,10 +74,6 @@ public class CellularSecurityNotificationsPreferenceController extends return UNSUPPORTED_ON_DEVICE; } - if (!areFlagsEnabled()) { - return UNSUPPORTED_ON_DEVICE; - } - // Check there are valid SIM cards which can be displayed to the user, otherwise this // setting should not be shown. List availableSubs = SubscriptionUtil.getAvailableSubscriptions(mContext); @@ -106,10 +101,6 @@ public class CellularSecurityNotificationsPreferenceController extends */ @Override public boolean isChecked() { - if (!areFlagsEnabled()) { - return false; - } - try { // Note: the default behavior for this toggle is disabled (as the underlying // TelephonyManager APIs are disabled by default) @@ -144,11 +135,6 @@ public class CellularSecurityNotificationsPreferenceController extends Log.i(LOG_TAG, "Disabling cellular security notifications."); } - // Check flag status - if (!areFlagsEnabled()) { - return false; - } - try { setNotifications(isChecked); } catch (Exception e) { @@ -177,13 +163,6 @@ public class CellularSecurityNotificationsPreferenceController extends && mTelephonyManager.isCellularIdentifierDisclosureNotificationsEnabled(); } - private boolean areFlagsEnabled() { - if (!Flags.enableModemCipherTransparencyUnsolEvents()) { - return false; - } - return true; - } - protected boolean isSafetyCenterSupported() { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { return false; diff --git a/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java index 05ca990e789..0cb42ecb09c 100644 --- a/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java @@ -31,7 +31,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.platform.test.flag.junit.SetFlagsRule; import android.safetycenter.SafetyCenterManager; import android.telephony.TelephonyManager; @@ -42,11 +41,8 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; -import com.android.internal.telephony.flags.Flags; - import org.junit.Assume; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -54,8 +50,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) public final class CellularSecurityPreferenceControllerTest { - @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); - @Mock private TelephonyManager mTelephonyManager; private Preference mPreference; @@ -91,9 +85,6 @@ public final class CellularSecurityPreferenceControllerTest { @Test public void getAvailabilityStatus_hardwareSupported_shouldReturnTrue() { - // Enable telephony API flags for testing - enableFlags(true); - // Hardware support is enabled doReturn(true).when(mTelephonyManager).isNullCipherNotificationsEnabled(); doReturn(true).when(mTelephonyManager) @@ -120,9 +111,6 @@ public final class CellularSecurityPreferenceControllerTest { @Test public void getAvailabilityStatus_noHardwareSupport_shouldReturnFalse() { - // Enable telephony API flags for testing - enableFlags(true); - // Hardware support is disabled doThrow(new UnsupportedOperationException("test")).when(mTelephonyManager) .isNullCipherNotificationsEnabled(); @@ -133,11 +121,4 @@ public final class CellularSecurityPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } - - private void enableFlags(boolean enabled) { - if (enabled) { - } else { - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - } - } } 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 516c1970d0b..f8b3798207c 100644 --- a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Build; -import android.platform.test.flag.junit.SetFlagsRule; import android.safetycenter.SafetyCenterManager; import android.telephony.TelephonyManager; @@ -39,11 +38,8 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; -import com.android.internal.telephony.flags.Flags; - import org.junit.Assume; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -51,8 +47,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) public class CellularSecurityNotificationsDividerControllerTest { - @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); - @Mock private TelephonyManager mTelephonyManager; private Preference mPreference; @@ -86,9 +80,6 @@ public class CellularSecurityNotificationsDividerControllerTest { @Test public void getAvailabilityStatus_hardwareSupported_shouldReturnTrue() { - // Enable telephony API flags for testing - enableFlags(true); - // Hardware support is enabled doReturn(true).when(mTelephonyManager).isNullCipherNotificationsEnabled(); doReturn(true).when(mTelephonyManager) @@ -99,9 +90,6 @@ public class CellularSecurityNotificationsDividerControllerTest { @Test public void getAvailabilityStatus_noHardwareSupport_shouldReturnFalse() { - // Enable telephony API flags for testing - enableFlags(true); - // Hardware support is disabled doThrow(new UnsupportedOperationException("test")).when(mTelephonyManager) .isNullCipherNotificationsEnabled(); @@ -110,12 +98,4 @@ public class CellularSecurityNotificationsDividerControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } - - private void enableFlags(boolean enabled) { - if (enabled) { - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - } else { - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - } - } } 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 27cba35e189..8b4ce1adb97 100644 --- a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Build; -import android.platform.test.flag.junit.SetFlagsRule; import android.safetycenter.SafetyCenterManager; import android.telephony.TelephonyManager; @@ -40,11 +39,8 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; -import com.android.internal.telephony.flags.Flags; - import org.junit.Assume; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -52,8 +48,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) public class CellularSecurityNotificationsPreferenceControllerTest { - @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); - @Mock private TelephonyManager mTelephonyManager; private Preference mPreference; @@ -87,9 +81,6 @@ public class CellularSecurityNotificationsPreferenceControllerTest { @Test public void getAvailabilityStatus_hardwareSupported_shouldReturnTrue() { - // All flags enabled - enableFlags(true); - // Hardware support is enabled doReturn(true).when(mTelephonyManager).isNullCipherNotificationsEnabled(); doReturn(true).when(mTelephonyManager) @@ -100,9 +91,6 @@ public class CellularSecurityNotificationsPreferenceControllerTest { @Test public void getAvailabilityStatus_noHardwareSupport_shouldReturnFalse() { - // All flags enabled - enableFlags(true); - // Hardware support is disabled doThrow(new UnsupportedOperationException("test")).when(mTelephonyManager) .isNullCipherNotificationsEnabled(); @@ -114,8 +102,6 @@ public class CellularSecurityNotificationsPreferenceControllerTest { @Test public void setChecked_shouldReturnTrue() { - enableFlags(true); - // Hardware support is enabled, enabling the feature doNothing().when(mTelephonyManager).setNullCipherNotificationsEnabled(true); doNothing().when(mTelephonyManager) @@ -140,8 +126,6 @@ public class CellularSecurityNotificationsPreferenceControllerTest { @Test public void isChecked_hardwareUnsupported_shouldReturnFalse() { - enableFlags(true); - // Hardware support is disabled doThrow(new UnsupportedOperationException("test")).when(mTelephonyManager) .isNullCipherNotificationsEnabled(); @@ -153,8 +137,6 @@ public class CellularSecurityNotificationsPreferenceControllerTest { @Test public void isChecked_notificationsDisabled_shouldReturnFalse() { - enableFlags(true); - // Hardware support is enabled, but APIs are disabled doReturn(false).when(mTelephonyManager).isNullCipherNotificationsEnabled(); doReturn(false).when(mTelephonyManager) @@ -165,12 +147,4 @@ public class CellularSecurityNotificationsPreferenceControllerTest { doReturn(true).when(mTelephonyManager).isNullCipherNotificationsEnabled(); assertThat(mController.isChecked()).isFalse(); } - - private void enableFlags(boolean enabled) { - if (enabled) { - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - } else { - mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - } - } }