Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d664f30 authored Feb 03, 2025 by Treehugger Robot Committed by Android (Google) Code Review Feb 03, 2025

Merge "Cleaned up the flag enable_modem_cipher_transparency" into main

parents c1163a15 1fd847de

src/com/android/settings/network/CellularSecurityPreferenceController.java

+1 −2

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

src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerController.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,8 +60,7 @@ public class CellularSecurityNotificationsDividerController extends

	@Override		@Override
	public int getAvailabilityStatus() {		public int getAvailabilityStatus() {
	if (!Flags.enableModemCipherTransparencyUnsolEvents()		if (!Flags.enableModemCipherTransparencyUnsolEvents()) {
	\|\| !Flags.enableModemCipherTransparency()) {
	return UNSUPPORTED_ON_DEVICE;		return UNSUPPORTED_ON_DEVICE;
	}		}
	if (!isSafetyCenterSupported()) {		if (!isSafetyCenterSupported()) {

src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceController.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -178,8 +178,7 @@ public class CellularSecurityNotificationsPreferenceController extends
	}		}

	private boolean areFlagsEnabled() {		private boolean areFlagsEnabled() {
	if (!Flags.enableModemCipherTransparencyUnsolEvents()		if (!Flags.enableModemCipherTransparencyUnsolEvents()) {
	\|\| !Flags.enableModemCipherTransparency()) {
	return false;		return false;
	}		}
	return true;		return true;

tests/unit/src/com/android/settings/network/CellularSecurityPreferenceControllerTest.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -136,10 +136,8 @@ public final class CellularSecurityPreferenceControllerTest {

	private void enableFlags(boolean enabled) {		private void enableFlags(boolean enabled) {
	if (enabled) {		if (enabled) {
	mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
	} else {		} else {
	mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);		mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
	mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
	}		}
	}		}
	}		}

tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsDividerControllerTest.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -114,10 +114,8 @@ public class CellularSecurityNotificationsDividerControllerTest {
	private void enableFlags(boolean enabled) {		private void enableFlags(boolean enabled) {
	if (enabled) {		if (enabled) {
	mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);		mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
	mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
	} else {		} else {
	mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);		mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);
	mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);
	}		}
	}		}
	}		}