Merge "Enable null cipher toggle by default" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
6a2f6960ab
@@ -59,7 +59,7 @@ public class NullAlgorithmsPreferenceController extends TelephonyTogglePreferenc
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CELLULAR_SECURITY,
|
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");
|
Log.i(LOG_TAG, "Null cipher toggle is disabled by DeviceConfig");
|
||||||
return CONDITIONALLY_UNAVAILABLE;
|
return CONDITIONALLY_UNAVAILABLE;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user