Merge "resolve merge conflicts of 0e680785e4 to qt-r1-dev" into qt-r1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2a5ac75f63
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user