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

Commit 6ce4d30b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not mark OTHER as a null cipher" into main

parents 1802a19f c968a696

src/java/com/android/internal/telephony/security/NullCipherNotifier.java

+0 −1
Original line number Diff line number Diff line
@@ -251,7 +251,6 @@ public class NullCipherNotifier { 
            case SecurityAlgorithmUpdate.SECURITY_ALGORITHM_IMS_NULL:

            case SecurityAlgorithmUpdate.SECURITY_ALGORITHM_SIP_NULL:

            case SecurityAlgorithmUpdate.SECURITY_ALGORITHM_SRTP_NULL:

            case SecurityAlgorithmUpdate.SECURITY_ALGORITHM_OTHER:

                return true;

            default:

                return false;

tests/telephonytests/src/com/android/internal/telephony/security/NullCipherNotifierTest.java

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ public class NullCipherNotifierTest { 
                    SecurityAlgorithmUpdate.SECURITY_ALGORITHM_NEA0,

                    SecurityAlgorithmUpdate.SECURITY_ALGORITHM_IMS_NULL,

                    SecurityAlgorithmUpdate.SECURITY_ALGORITHM_SIP_NULL,

                    SecurityAlgorithmUpdate.SECURITY_ALGORITHM_SRTP_NULL,

                    SecurityAlgorithmUpdate.SECURITY_ALGORITHM_OTHER);

                    SecurityAlgorithmUpdate.SECURITY_ALGORITHM_SRTP_NULL);

    private static final List<Integer> NON_NULL_CIPHERS =

            List.of(SecurityAlgorithmUpdate.SECURITY_ALGORITHM_A51,

                    SecurityAlgorithmUpdate.SECURITY_ALGORITHM_A52,