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

Commit ec53bda6 authored by Aaron Liu's avatar Aaron Liu
Browse files

Maintain parity with central surfaces impl. 

Change arguments to be true by default to maintain parity with central
surfaces.

Bug: 278273334
Fixes: 280800920
Test: long press settings
Test: ABTD with change and released flag (It passes)
Test: ABTD without change and released flag (It fails)
Test: Atest on local device (It passes)
Change-Id: Ifa680f247fec41a02ab911d60207459a1fce6bae
parent 284f8b62

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