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

Commit 3d0d0f9d authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the flag enable_identifier_disclosure_transparency_unsol_events" into main

parents 69f3696e 6e26457b

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

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll 
    @Override

    public int getAvailabilityStatus() {

        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)

                || !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparency()) {

            return UNSUPPORTED_ON_DEVICE;

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.enableIdentifierDisclosureTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

        if (!Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparency()) {

            return UNSUPPORTED_ON_DEVICE;

        }

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.enableIdentifierDisclosureTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

        if (!Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparency()) {

            return false;

        }

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

+0 −17
Original line number Diff line number Diff line
@@ -134,28 +134,11 @@ public final class CellularSecurityPreferenceControllerTest { 
        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    public void getAvailabilityStatus_flagsDisabled_shouldReturnFalse() {

        // Both flags disabled

        enableFlags(false);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);



        // One flag is disabled

        mSetFlagsRule.disableFlags(

                Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    private void enableFlags(boolean enabled) {

        if (enabled) {

            mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.enableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_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_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

        }

    }

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

+0 −16
Original line number Diff line number Diff line
@@ -111,28 +111,12 @@ public class CellularSecurityNotificationsDividerControllerTest { 
        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    public void getAvailabilityStatus_flagsDisabled_shouldReturnFalse() {

        // Both flags disabled

        enableFlags(false);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);



        // One flag is disabled

        mSetFlagsRule.disableFlags(

                Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    private void enableFlags(boolean enabled) {

        if (enabled) {

            mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.enableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_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_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

        }

    }