commit 2339f59b81fb78c0d7efb85f56cbc7afef26ec44
author Dave Mankoff <mankoff@google.com> Fri Jun 28 16:33:25 2019 -0400
committer Dave Mankoff <mankoff@google.com> Mon Aug 12 12:44:30 2019 -0400
tree 412bdce829ed5d22ec73c8a7fb2236b80007c4b7
parent 56baff70e90de2389e6ae58c627aa2babf44a1e3

Pass FalsingManager down through more classes.

The CP's http://ag/c/8269205, with some minor modifications.

This removes FalsingManagerFactory, replacing it with
calls to Depedency.get() and pushes those calls further
up the stack in hopes that the FalsingManager can be directly
injected where it's needed in the future.

Contains a few random lint cleanups.

Bug: 136279712
Test: atest SystemUITests
Change-Id: Idd66e40d3bb9ebe9ca583166d5e961cc70ea51b8
Merged-In: Ie24acd33b0d81ae2112aead0c0d5a8658e04994e

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
index c7f4c38..e361e988 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
@@ -34,9 +34,9 @@
 import com.android.keyguard.KeyguardUpdateMonitor;
 import com.android.keyguard.ViewMediatorCallback;
 import com.android.systemui.assist.AssistManager;
-import com.android.systemui.classifier.FalsingManagerFactory;
 import com.android.systemui.dock.DockManager;
 import com.android.systemui.keyguard.DismissCallbackRegistry;
+import com.android.systemui.plugins.FalsingManager;
 import com.android.systemui.plugins.statusbar.StatusBarStateController;
 import com.android.systemui.power.EnhancedEstimates;
 import com.android.systemui.power.EnhancedEstimatesImpl;
@@ -133,9 +133,10 @@
     public KeyguardBouncer createKeyguardBouncer(Context context, ViewMediatorCallback callback,
             LockPatternUtils lockPatternUtils, ViewGroup container,
             DismissCallbackRegistry dismissCallbackRegistry,
-            KeyguardBouncer.BouncerExpansionCallback expansionCallback) {
+            KeyguardBouncer.BouncerExpansionCallback expansionCallback,
+            FalsingManager falsingManager) {
         return new KeyguardBouncer(context, callback, lockPatternUtils, container,
-                dismissCallbackRegistry, FalsingManagerFactory.getInstance(context),
+                dismissCallbackRegistry, falsingManager,
                 expansionCallback, UnlockMethodCache.getInstance(context),
                 KeyguardUpdateMonitor.getInstance(context), new Handler(Looper.getMainLooper()));
     }