Merge "resolve merge conflicts of 0e680785e4 to qt-r1-dev" into qt-r1-dev

This commit is contained in:
TreeHugger Robot
2019-07-19 23:47:35 +00:00
committed by Android (Google) Code Review

View File

@@ -92,7 +92,7 @@ public class FalsingManagerProxy implements FalsingManager {
@VisibleForTesting
public void setupFalsingManager(Context context) {
boolean brightlineEnabled = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, false);
DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);
if (mInternalFalsingManager != null) {
mInternalFalsingManager.cleanup();