Merge "resolve merge conflicts of 8d7481f01e to qt-r1-dev-plus-aosp" into qt-r1-dev-plus-aosp

am: a1c136d77e

Change-Id: I400fcc8f89df9e16ece6cdf19112dac335dc004d
This commit is contained in:
Dave Mankoff
2019-07-19 17:33:24 -07:00
committed by android-build-merger

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();