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

Commit 853ac103 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge changes I025902ed,I44f3fc61 into main 

* changes:
  Fix user switcher flag test
  Move register callback on view attach and detach
parents d65eea6b baff0096

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSimPinViewControllerTest.kt

+6 −4
Original line number Diff line number Diff line
@@ -100,9 +100,12 @@ class KeyguardSimPinViewControllerTest : SysuiTestCase() { 
                mSelectedUserInteractor

            )

        underTest.init()

        underTest.onViewAttached()

        underTest.onResume(0)

        verify(keyguardUpdateMonitor)

            .registerCallback(updateMonitorCallbackArgumentCaptor.capture())

        reset(keyguardMessageAreaController)

        reset(keyguardUpdateMonitor)

    }



    @Test
@@ -110,25 +113,24 @@ class KeyguardSimPinViewControllerTest : SysuiTestCase() { 
        underTest.onViewAttached()

        verify(keyguardMessageAreaController)

            .setMessage(context.resources.getString(R.string.keyguard_enter_your_pin), false)

        verify(keyguardUpdateMonitor)

            .registerCallback(any(KeyguardUpdateMonitorCallback::class.java))

    }



    @Test

    fun onViewDetached() {

        underTest.onViewDetached()

        verify(keyguardUpdateMonitor).removeCallback(any(KeyguardUpdateMonitorCallback::class.java))

    }



    @Test

    fun onResume() {

        reset(keyguardUpdateMonitor)

        underTest.onResume(KeyguardSecurityView.VIEW_REVEALED)

        verify(keyguardUpdateMonitor)

            .registerCallback(any(KeyguardUpdateMonitorCallback::class.java))

    }



    @Test

    fun onPause() {

        underTest.onPause()

        verify(keyguardUpdateMonitor).removeCallback(any(KeyguardUpdateMonitorCallback::class.java))

    }



    @Test

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

+7 −2
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ public class KeyguardSimPinViewController 
    @Override

    protected void onViewAttached() {

        super.onViewAttached();

        mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback);

    }



    @Override

    protected void onViewDetached() {

        super.onViewDetached();

        mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback);

    }



    @Override
@@ -128,14 +135,12 @@ public class KeyguardSimPinViewController 
    @Override

    public void onResume(int reason) {

        super.onResume(reason);

        mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback);

        mView.resetState();

    }



    @Override

    public void onPause() {

        super.onPause();

        mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback);



        // dismiss the dialog.

        if (mSimUnlockProgressDialog != null) {

packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/UserSwitcherInteractorTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import androidx.test.filters.SmallTest 
import com.android.internal.logging.UiEventLogger

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.systemui.Flags as AConfigFlags

import com.android.systemui.GuestResetOrExitSessionReceiver

import com.android.systemui.GuestResumeSessionReceiver

import com.android.systemui.SysuiTestCase
@@ -121,6 +122,7 @@ class UserSwitcherInteractorTest : SysuiTestCase() { 
        )



        utils.featureFlags.set(Flags.FULL_SCREEN_USER_SWITCHER, false)

        mSetFlagsRule.enableFlags(AConfigFlags.FLAG_SWITCH_USER_ON_BG)

        spyContext = spy(context)

        keyguardReply = KeyguardInteractorFactory.create(featureFlags = utils.featureFlags)

        keyguardRepository = keyguardReply.repository
@@ -172,6 +174,7 @@ class UserSwitcherInteractorTest : SysuiTestCase() { 
            userRepository.setSettings(UserSwitcherSettingsModel(isUserSwitcherEnabled = true))



            underTest.onRecordSelected(UserRecord(info = userInfos[1]), dialogShower)

            runCurrent()



            verify(uiEventLogger, times(1))

                .log(MultiUserActionsEvent.SWITCH_TO_USER_FROM_USER_SWITCHER)
@@ -191,6 +194,7 @@ class UserSwitcherInteractorTest : SysuiTestCase() { 
            userRepository.setSettings(UserSwitcherSettingsModel(isUserSwitcherEnabled = true))



            underTest.onRecordSelected(UserRecord(info = userInfos.last()))

            runCurrent()



            verify(uiEventLogger, times(1))

                .log(MultiUserActionsEvent.SWITCH_TO_GUEST_FROM_USER_SWITCHER)
@@ -218,6 +222,7 @@ class UserSwitcherInteractorTest : SysuiTestCase() { 
            userRepository.setSettings(UserSwitcherSettingsModel(isUserSwitcherEnabled = true))



            underTest.onRecordSelected(UserRecord(info = userInfos.last()))

            runCurrent()



            verify(uiEventLogger, times(1))

                .log(MultiUserActionsEvent.SWITCH_TO_RESTRICTED_USER_FROM_USER_SWITCHER)