Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23e9e537 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Revert^2 "Remove final calls to Dependency.get from keyguard." 

bfec35b4

Change-Id: I423b0aa056a5f6ad601874f4bff41299b35f0a7f
parent 9d947fb6

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+6 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.view.WindowManager; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.dagger.KeyguardStatusViewComponent;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.UiBackground;

import com.android.systemui.navigationbar.NavigationBarController;
@@ -46,12 +45,15 @@ import java.util.concurrent.Executor; 


import javax.inject.Inject;



import dagger.Lazy;



public class KeyguardDisplayManager {

    protected static final String TAG = "KeyguardDisplayManager";

    private static boolean DEBUG = KeyguardConstants.DEBUG;



    private MediaRouter mMediaRouter = null;

    private final DisplayManager mDisplayService;

    private final Lazy<NavigationBarController> mNavigationBarControllerLazy;

    private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private final Context mContext;
@@ -85,9 +87,11 @@ public class KeyguardDisplayManager { 


    @Inject

    public KeyguardDisplayManager(Context context,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory,

            @UiBackground Executor uiBgExecutor) {

        mContext = context;

        mNavigationBarControllerLazy = navigationBarControllerLazy;

        mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;

        uiBgExecutor.execute(() -> mMediaRouter = mContext.getSystemService(MediaRouter.class));

        mDisplayService = mContext.getSystemService(DisplayManager.class);
@@ -240,7 +244,7 @@ public class KeyguardDisplayManager { 
        // Leave this task to {@link StatusBarKeyguardViewManager}

        if (displayId == DEFAULT_DISPLAY) return;



        NavigationBarView navBarView = Dependency.get(NavigationBarController.class)

        NavigationBarView navBarView = mNavigationBarControllerLazy.get()

                .getNavigationBarView(displayId);

        // We may not have nav bar on a display.

        if (navBarView == null) return;

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java

+8 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.telephony.SubscriptionManager; 
import android.telephony.TelephonyManager;



import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.Dependency;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;
@@ -49,24 +48,27 @@ public class KeyguardSecurityModel { 
    private final boolean mIsPukScreenAvailable;



    private final LockPatternUtils mLockPatternUtils;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;



    @Inject

    KeyguardSecurityModel(@Main Resources resources, LockPatternUtils lockPatternUtils) {

    KeyguardSecurityModel(@Main Resources resources, LockPatternUtils lockPatternUtils,

            KeyguardUpdateMonitor keyguardUpdateMonitor) {

        mIsPukScreenAvailable = resources.getBoolean(

                com.android.internal.R.bool.config_enable_puk_unlock_screen);

        mLockPatternUtils = lockPatternUtils;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

    }



    public SecurityMode getSecurityMode(int userId) {

        KeyguardUpdateMonitor monitor = Dependency.get(KeyguardUpdateMonitor.class);



        if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId(

                monitor.getNextSubIdForState(TelephonyManager.SIM_STATE_PUK_REQUIRED))) {

                mKeyguardUpdateMonitor.getNextSubIdForState(

                        TelephonyManager.SIM_STATE_PUK_REQUIRED))) {

            return SecurityMode.SimPuk;

        }



        if (SubscriptionManager.isValidSubscriptionId(

                monitor.getNextSubIdForState(TelephonyManager.SIM_STATE_PIN_REQUIRED))) {

                mKeyguardUpdateMonitor.getNextSubIdForState(

                        TelephonyManager.SIM_STATE_PIN_REQUIRED))) {

            return SecurityMode.SimPin;

        }

packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java

+1 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.widget.ImageView; 
import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.classifier.FalsingCollector;
@@ -198,8 +197,7 @@ public class KeyguardSimPukViewController 
        if (count < 2) {

            msg = rez.getString(R.string.kg_puk_enter_puk_hint);

        } else {

            SubscriptionInfo info = Dependency.get(KeyguardUpdateMonitor.class)

                    .getSubscriptionInfoForSubId(mSubId);

            SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

            CharSequence displayName = info != null ? info.getDisplayName() : "";

            msg = rez.getString(R.string.kg_puk_enter_puk_hint_multi, displayName);

            if (info != null) {

packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java

+4 −5
Original line number Diff line number Diff line
@@ -53,12 +53,12 @@ import java.util.concurrent.Executor; 
@TestableLooper.RunWithLooper

public class KeyguardDisplayManagerTest extends SysuiTestCase {



    @Mock

    private NavigationBarController mNavigationBarController;

    @Mock

    private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;



    @Mock

    private DisplayManager mDisplayManager;



    @Mock

    private KeyguardDisplayManager.KeyguardPresentation mKeyguardPresentation;
@@ -76,9 +76,8 @@ public class KeyguardDisplayManagerTest extends SysuiTestCase { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext.addMockSystemService(DisplayManager.class, mDisplayManager);

        mDependency.injectMockDependency(NavigationBarController.class);

        mManager = spy(new KeyguardDisplayManager(mContext, mKeyguardStatusViewComponentFactory,

                mBackgroundExecutor));

        mManager = spy(new KeyguardDisplayManager(mContext, () -> mNavigationBarController,

                mKeyguardStatusViewComponentFactory, mBackgroundExecutor));

        doReturn(mKeyguardPresentation).when(mManager).createPresentation(any());



        mDefaultDisplay = new Display(DisplayManagerGlobal.getInstance(), Display.DEFAULT_DISPLAY,