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

Commit b2f4c0a1 authored by Wu Ahan's avatar Wu Ahan Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE while running UserSwitcherController" into sc-v2-dev am: 69cd4caa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16262375

Change-Id: I84c96cafe2333d4adf3b735bcdc20d7f9ac56755
parents 3e7d377c 69cd4caa

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt

+14 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.UserHandle 
import android.os.UserManager

import android.os.UserManager

import android.testing.AndroidTestingRunner

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper

import android.testing.TestableLooper

import android.view.ThreadedRenderer

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.logging.testing.UiEventLoggerFake

import com.android.internal.logging.testing.UiEventLoggerFake
@@ -63,6 +64,8 @@ import org.mockito.Mock 
import org.mockito.Mockito.`when`

import org.mockito.Mockito.`when`

import org.mockito.Mockito.any

import org.mockito.Mockito.any

import org.mockito.Mockito.anyString

import org.mockito.Mockito.anyString

import org.mockito.Mockito.doNothing

import org.mockito.Mockito.doReturn

import org.mockito.Mockito.mock

import org.mockito.Mockito.mock

import org.mockito.Mockito.verify

import org.mockito.Mockito.verify

import org.mockito.MockitoAnnotations

import org.mockito.MockitoAnnotations
@@ -90,6 +93,7 @@ class UserSwitcherControllerTest : SysuiTestCase() { 
    @Mock private lateinit var latencyTracker: LatencyTracker

    @Mock private lateinit var latencyTracker: LatencyTracker

    @Mock private lateinit var dialogShower: UserSwitchDialogController.DialogShower

    @Mock private lateinit var dialogShower: UserSwitchDialogController.DialogShower

    @Mock private lateinit var notificationShadeWindowView: NotificationShadeWindowView

    @Mock private lateinit var notificationShadeWindowView: NotificationShadeWindowView

    @Mock private lateinit var threadedRenderer: ThreadedRenderer

    private lateinit var testableLooper: TestableLooper

    private lateinit var testableLooper: TestableLooper

    private lateinit var uiBgExecutor: FakeExecutor

    private lateinit var uiBgExecutor: FakeExecutor

    private lateinit var uiEventLogger: UiEventLoggerFake

    private lateinit var uiEventLogger: UiEventLoggerFake
@@ -146,6 +150,16 @@ class UserSwitcherControllerTest : SysuiTestCase() { 
                dumpManager)

                dumpManager)

        userSwitcherController.mPauseRefreshUsers = true

        userSwitcherController.mPauseRefreshUsers = true





        // Since userSwitcherController involves InteractionJankMonitor.

        // Let's fulfill the dependencies.

        val mockedContext = mock(Context::class.java)

        doReturn(mockedContext).`when`(notificationShadeWindowView).context

        doReturn(true).`when`(notificationShadeWindowView).isAttachedToWindow

        doNothing().`when`(threadedRenderer).addObserver(any())

        doNothing().`when`(threadedRenderer).removeObserver(any())

        doReturn(threadedRenderer).`when`(notificationShadeWindowView).threadedRenderer

        userSwitcherController.init(notificationShadeWindowView)



        picture = UserIcons.convertToBitmap(context.getDrawable(R.drawable.ic_avatar_user))

        picture = UserIcons.convertToBitmap(context.getDrawable(R.drawable.ic_avatar_user))

        userSwitcherController.init(notificationShadeWindowView)

        userSwitcherController.init(notificationShadeWindowView)

    }

    }