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

Commit bfec35b4 authored by Alec Mouri's avatar Alec Mouri Committed by Dave Mankoff
Browse files

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

Revert submission 13536242-b179775696-depenency-get-keyguard

Reason for revert: Candidate reversion for broken tests: b/180440298
Reverted Changes:
I6d0271692:Add ViewController to CarrierText.
I4d9a4a21f:Add Controller for Emergency Button.
I4c76d99f9:Remove Dependency.get from KeyguardSliceTextView.
I730593fcf:Add injection to ClockProvider.
Ifbb93e624:Remove Dependency.get from KeyguardStatusView.
I237215456:Remove final calls to Dependency.get from keyguard...

Change-Id: I7ae9d1441579068a17fc6cf013176fd291de004a
parent a7e5dab6

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

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




import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.dagger.KeyguardStatusViewComponent;

import com.android.keyguard.dagger.KeyguardStatusViewComponent;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.R;

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

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

import com.android.systemui.navigationbar.NavigationBarController;

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




import javax.inject.Inject;

import javax.inject.Inject;





import dagger.Lazy;



public class KeyguardDisplayManager {

public class KeyguardDisplayManager {

    protected static final String TAG = "KeyguardDisplayManager";

    protected static final String TAG = "KeyguardDisplayManager";

    private static boolean DEBUG = KeyguardConstants.DEBUG;

    private static boolean DEBUG = KeyguardConstants.DEBUG;





    private MediaRouter mMediaRouter = null;

    private MediaRouter mMediaRouter = null;

    private final DisplayManager mDisplayService;

    private final DisplayManager mDisplayService;

    private final Lazy<NavigationBarController> mNavigationBarControllerLazy;

    private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private final Context mContext;

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




    @Inject

    @Inject

    public KeyguardDisplayManager(Context context,

    public KeyguardDisplayManager(Context context,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory,

            KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory,

            @UiBackground Executor uiBgExecutor) {

            @UiBackground Executor uiBgExecutor) {

        mContext = context;

        mContext = context;

        mNavigationBarControllerLazy = navigationBarControllerLazy;

        mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;

        mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;

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

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

        mDisplayService = mContext.getSystemService(DisplayManager.class);

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

        // Leave this task to {@link StatusBarKeyguardViewManager}

        if (displayId == DEFAULT_DISPLAY) return;

        if (displayId == DEFAULT_DISPLAY) return;





        NavigationBarView navBarView = mNavigationBarControllerLazy.get()

        NavigationBarView navBarView = Dependency.get(NavigationBarController.class)

                .getNavigationBarView(displayId);

                .getNavigationBarView(displayId);

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

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

        if (navBarView == null) return;

        if (navBarView == null) return;

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

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

import android.telephony.TelephonyManager;





import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.Dependency;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SysUISingleton;

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

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

    private final boolean mIsPukScreenAvailable;





    private final LockPatternUtils mLockPatternUtils;

    private final LockPatternUtils mLockPatternUtils;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;





    @Inject

    @Inject

    KeyguardSecurityModel(@Main Resources resources, LockPatternUtils lockPatternUtils,

    KeyguardSecurityModel(@Main Resources resources, LockPatternUtils lockPatternUtils) {

            KeyguardUpdateMonitor keyguardUpdateMonitor) {

        mIsPukScreenAvailable = resources.getBoolean(

        mIsPukScreenAvailable = resources.getBoolean(

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

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

        mLockPatternUtils = lockPatternUtils;

        mLockPatternUtils = lockPatternUtils;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

    }

    }





    public SecurityMode getSecurityMode(int userId) {

    public SecurityMode getSecurityMode(int userId) {

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



        if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId(

        if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId(

                mKeyguardUpdateMonitor.getNextSubIdForState(

                monitor.getNextSubIdForState(TelephonyManager.SIM_STATE_PUK_REQUIRED))) {

                        TelephonyManager.SIM_STATE_PUK_REQUIRED))) {

            return SecurityMode.SimPuk;

            return SecurityMode.SimPuk;

        }

        }





        if (SubscriptionManager.isValidSubscriptionId(

        if (SubscriptionManager.isValidSubscriptionId(

                mKeyguardUpdateMonitor.getNextSubIdForState(

                monitor.getNextSubIdForState(TelephonyManager.SIM_STATE_PIN_REQUIRED))) {

                        TelephonyManager.SIM_STATE_PIN_REQUIRED))) {

            return SecurityMode.SimPin;

            return SecurityMode.SimPin;

        }

        }

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

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

import com.android.internal.util.LatencyTracker;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.classifier.FalsingCollector;

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

        if (count < 2) {

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

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

        } else {

        } else {

            SubscriptionInfo info = mKeyguardUpdateMonitor.getSubscriptionInfoForSubId(mSubId);

            SubscriptionInfo info = Dependency.get(KeyguardUpdateMonitor.class)

                    .getSubscriptionInfoForSubId(mSubId);

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

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

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

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

            if (info != null) {

            if (info != null) {

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

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

@TestableLooper.RunWithLooper

public class KeyguardDisplayManagerTest extends SysuiTestCase {

public class KeyguardDisplayManagerTest extends SysuiTestCase {





    @Mock

    private NavigationBarController mNavigationBarController;

    @Mock

    @Mock

    private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;



    @Mock

    @Mock

    private DisplayManager mDisplayManager;

    private DisplayManager mDisplayManager;



    @Mock

    @Mock

    private KeyguardDisplayManager.KeyguardPresentation mKeyguardPresentation;

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

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

        mContext.addMockSystemService(DisplayManager.class, mDisplayManager);

        mContext.addMockSystemService(DisplayManager.class, mDisplayManager);

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

        mDependency.injectMockDependency(NavigationBarController.class);

                mKeyguardStatusViewComponentFactory, mBackgroundExecutor));

        mManager = spy(new KeyguardDisplayManager(mContext, mKeyguardStatusViewComponentFactory,

                mBackgroundExecutor));

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

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





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

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