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

Commit 5161aff8 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" into main

parents 6e121940 506c3e04

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll 
        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)

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

                || !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()

                || !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableIdentifierDisclosureTransparency()

                || !Flags.enableModemCipherTransparency()) {

                || !Flags.enableModemCipherTransparency()) {

            return UNSUPPORTED_ON_DEVICE;

            return UNSUPPORTED_ON_DEVICE;

        }

        }

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,6 @@ public class CellularSecurityNotificationsDividerController extends 
    public int getAvailabilityStatus() {

    public int getAvailabilityStatus() {

        if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()

        if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableIdentifierDisclosureTransparency()

                || !Flags.enableModemCipherTransparency()) {

                || !Flags.enableModemCipherTransparency()) {

            return UNSUPPORTED_ON_DEVICE;

            return UNSUPPORTED_ON_DEVICE;

        }

        }

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -180,7 +180,6 @@ public class CellularSecurityNotificationsPreferenceController extends 
    private boolean areFlagsEnabled() {

    private boolean areFlagsEnabled() {

        if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()

        if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableModemCipherTransparencyUnsolEvents()

                || !Flags.enableIdentifierDisclosureTransparency()

                || !Flags.enableModemCipherTransparency()) {

                || !Flags.enableModemCipherTransparency()) {

            return false;

            return false;

        }

        }

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -169,15 +169,11 @@ public final class CellularSecurityPreferenceControllerTest { 
            mSetFlagsRule.enableFlags(

            mSetFlagsRule.enableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.enableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_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(

            mSetFlagsRule.disableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.disableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);

        }

        }

    }

    }

}
 
}

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -129,15 +129,11 @@ public class CellularSecurityNotificationsDividerControllerTest { 
            mSetFlagsRule.enableFlags(

            mSetFlagsRule.enableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.enableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_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(

            mSetFlagsRule.disableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY_UNSOL_EVENTS);

            mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY);

            mSetFlagsRule.disableFlags(

                    Flags.FLAG_ENABLE_IDENTIFIER_DISCLOSURE_TRANSPARENCY);

        }

        }

    }

    }

}
 
}