Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab

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

Change-Id: I4d39e88aca6e31c3e897a0d16ec45124906d63cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gil Cukierman
2023-05-02 23:51:30 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}