summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-07-19 23:51:17 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-07-19 23:51:17 +0000
commita1c136d77e189f042c50587c95d1950319d7aeee (patch)
tree72acb5b3691f9a7cb6b0d87bbd61aacbf304c877
parentaae92427cb00d254acfd8f4f29ab661ac2212e05 (diff)
parent3b87854adbf738657d2136cfc2f6c99daf97e5f4 (diff)
Merge "resolve merge conflicts of 8d7481f01e59c9538417ef603751b132d853035a to qt-r1-dev-plus-aosp" into qt-r1-dev-plus-aosp
-rw-r--r--packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
index bdcf0b36a04c..128cc614fd08 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
@@ -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();