Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-19 23:47:35 +00:00
committed by Android (Google) Code Review
parent 68d625bea6 3486cf4d0b
commit 2a5ac75f63
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java
View File

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