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

Commit 1fd847de authored by Jack Yu's avatar Jack Yu
Browse files

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
parent fe0c7809

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

+1 −2
Original line number Diff line number Diff line
@@ -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) {

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

+1 −2
Original line number Diff line number Diff line
@@ -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()) {

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

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



    private boolean areFlagsEnabled() {

        if (!Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparency()) {

        if (!Flags.enableModemCipherTransparencyUnsolEvents()) {

            return false;

        }

        return true;

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

+0 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }

}

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

+0 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }

}