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

Commit 13b49a9d 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: 6a2f6960 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756



Change-Id: I7bbe8f3aa976d7c1f1d1c387c0c01d7a551127bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47ccf9d7 6a2f6960

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class NullAlgorithmsPreferenceController extends TelephonyTogglePreferenc 
        }



        if (!DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CELLULAR_SECURITY,

                TelephonyManager.PROPERTY_ENABLE_NULL_CIPHER_TOGGLE, false)) {

                TelephonyManager.PROPERTY_ENABLE_NULL_CIPHER_TOGGLE, true)) {

            Log.i(LOG_TAG, "Null cipher toggle is disabled by DeviceConfig");

            return CONDITIONALLY_UNAVAILABLE;

        }