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

Commit a1825c3f authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Maintain parity with central surfaces impl." into udc-dev am: f3192865 

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



Change-Id: Ia93777e710e40aa68cb63e9ee2ec51fba5cb1468
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea92de40 f3192865

packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt

+9 −1
Original line number Diff line number Diff line
@@ -236,7 +236,11 @@ constructor( 


    override fun postStartActivityDismissingKeyguard(intent: Intent, delay: Int) {

        postOnUiThread(delay) {

            activityStarterInternal.startActivityDismissingKeyguard(intent = intent)

            activityStarterInternal.startActivityDismissingKeyguard(

                intent = intent,

                onlyProvisioned = true,

                dismissShade = true,

            )

        }

    }
@@ -248,6 +252,8 @@ constructor( 
        postOnUiThread(delay) {

            activityStarterInternal.startActivityDismissingKeyguard(

                intent = intent,

                onlyProvisioned = true,

                dismissShade = true,

                animationController = animationController,

            )

        }
@@ -262,6 +268,8 @@ constructor( 
        postOnUiThread(delay) {

            activityStarterInternal.startActivityDismissingKeyguard(

                intent = intent,

                onlyProvisioned = true,

                dismissShade = true,

                animationController = animationController,

                customMessage = customMessage,

            )

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ActivityStarterImplTest.kt

+19 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone 
import android.app.PendingIntent

import android.content.Intent

import android.os.RemoteException

import android.os.UserHandle

import android.testing.AndroidTestingRunner

import androidx.test.filters.SmallTest

import com.android.keyguard.KeyguardUpdateMonitor
@@ -102,6 +103,7 @@ class ActivityStarterImplTest : SysuiTestCase() { 
                activityIntentHelper,

                mainExecutor,

            )

        whenever(userTracker.userHandle).thenReturn(UserHandle.OWNER)

    }



    @Test
@@ -150,11 +152,28 @@ class ActivityStarterImplTest : SysuiTestCase() { 


    @Test

    fun postStartActivityDismissingKeyguard_intent_postsOnMain() {

        whenever(deviceProvisionedController.isDeviceProvisioned).thenReturn(true)

        val intent = mock(Intent::class.java)



        underTest.postStartActivityDismissingKeyguard(intent, 0)



        assertThat(mainExecutor.numPending()).isEqualTo(1)

        mainExecutor.runAllReady()



        verify(deviceProvisionedController).isDeviceProvisioned

        verify(shadeController).runPostCollapseRunnables()

    }



    @Test

    fun postStartActivityDismissingKeyguard_intent_notDeviceProvisioned_doesNotProceed() {

        whenever(deviceProvisionedController.isDeviceProvisioned).thenReturn(false)

        val intent = mock(Intent::class.java)



        underTest.postStartActivityDismissingKeyguard(intent, 0)

        mainExecutor.runAllReady()



        verify(deviceProvisionedController).isDeviceProvisioned

        verify(shadeController, never()).runPostCollapseRunnables()

    }



    @Test