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

Commit 5c4da20b authored by Gil Cukierman's avatar Gil Cukierman Committed by Automerger Merge Worker
Browse files

Merge "Enable null cipher toggle by default" into udc-dev am: 6593a98a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22932736



Change-Id: I86d03c9a27fe7d8b2bcf472b36f27f50d371ea80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dfaf6e16 6593a98a

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -5137,7 +5137,7 @@ public class GsmCdmaPhone extends Phone { 
    @Override

    public void handleNullCipherEnabledChange() {

        if (!DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CELLULAR_SECURITY,

                TelephonyManager.PROPERTY_ENABLE_NULL_CIPHER_TOGGLE, false)) {

                TelephonyManager.PROPERTY_ENABLE_NULL_CIPHER_TOGGLE, true)) {

            logi("Not handling null cipher update. Feature disabled by DeviceConfig.");

            return;

        }