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

Commit c968a696 authored by yomna's avatar yomna
Browse files

Do not mark OTHER as a null cipher 

The corresponding hardware value is unassigned and should not be used.

Bug: b/378002325
Flag: EXEMPT bugfix
Test: m
Change-Id: Ib63e316f4baa927a9c1ba5a3af04bbefce1def19
parent e1db9bd7

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,