From 42216b5eeb5802eb8e88f5f6533b052214ce8c89 Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Fri, 20 Sep 2019 12:05:07 -0400 Subject: DO NOT MERGE Revert line from master-cp that should be different in qpr1 In master, we retrieve the KeyguardUpdateMonitor through Dependency.get(). This change has not landed in qpr1 and should use a different method of access. Bug: 140270231 Test: atest SystemUITests Change-Id: Icbba30e52d4d011fc01cba13262b18a3a235316c --- .../src/com/android/systemui/classifier/FalsingManagerProxy.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java index ff3c5d46ed92..cff06227b857 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java @@ -27,7 +27,6 @@ import android.view.MotionEvent; import com.android.internal.annotations.VisibleForTesting; import com.android.keyguard.KeyguardUpdateMonitor; -import com.android.systemui.Dependency; import com.android.systemui.classifier.brightline.BrightLineFalsingManager; import com.android.systemui.classifier.brightline.FalsingDataProvider; import com.android.systemui.plugins.FalsingManager; @@ -108,7 +107,7 @@ public class FalsingManagerProxy implements FalsingManager { } else { mInternalFalsingManager = new BrightLineFalsingManager( new FalsingDataProvider(context.getResources().getDisplayMetrics()), - Dependency.get(KeyguardUpdateMonitor.class), + KeyguardUpdateMonitor.getInstance(context), mProximitySensor ); } -- cgit v1.2.3-59-g8ed1b