Merge "Enable the BrightLineFalsingManager by default on Q." into qt-dev

am: 0e680785e4

Change-Id: I92f0755aa748e131dea5a9fc5c22d7caecf33233
This commit is contained in:
Dave Mankoff
2019-07-19 13:12:00 -07:00
committed by android-build-merger
2 changed files with 4 additions and 1 deletions

View File

@@ -91,7 +91,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 (!brightlineEnabled) {
mInternalFalsingManager = new FalsingManagerImpl(context);
} else {

View File

@@ -56,6 +56,9 @@ public class FalsingManagerProxyTest extends SysuiTestCase {
mHandler = new Handler(mTestableLooper.getLooper());
mDefaultConfigValue = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
BRIGHTLINE_FALSING_MANAGER_ENABLED, false);
// In case it runs on a device where it's been set to true, set it to false by hand.
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
BRIGHTLINE_FALSING_MANAGER_ENABLED, "false", false);
}
@After