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

Commit 7e7db76d authored by Matt Pietal's avatar Matt Pietal
Browse files

Clean up misleading error condition on dismiss 

The device fold state is not actually in use.

Bug: 432256230
Test: atest KeyguardUnlockAnimationControllerTest
Flag: EXEMPT bugfix
Change-Id: I21dc5083c90f14562ea2b736b3febc663f513078
parent 34a5ab05

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ import androidx.test.filters.SmallTest 
import com.android.keyguard.KeyguardViewController

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.defaultDeviceState

import com.android.systemui.deviceStateManager

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController
@@ -70,7 +68,6 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 
    @Mock private lateinit var powerManager: PowerManager

    @Mock private lateinit var wallpaperManager: WallpaperManager

    private val kosmos = testKosmos()

    private val deviceStateManager = kosmos.deviceStateManager



    @Mock

    private lateinit var launcherUnlockAnimationController: ILauncherUnlockAnimationController.Stub
@@ -180,7 +177,6 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 
                    notificationShadeWindowController,

                    powerManager,

                    wallpaperManager,

                    deviceStateManager,

                ) {

                override fun shouldPerformSmartspaceTransition(): Boolean =

                    shouldPerformSmartspaceTransition
@@ -192,8 +188,6 @@ class KeyguardUnlockAnimationControllerTest : SysuiTestCase() { 


        whenever(keyguardViewController.viewRootImpl).thenReturn(mock(ViewRootImpl::class.java))

        whenever(powerManager.isInteractive).thenReturn(true)

        whenever(deviceStateManager.supportedDeviceStates)

            .thenReturn(listOf(kosmos.defaultDeviceState))



        // All of these fields are final, so we can't mock them, but are needed so that the surface

        // appear amount setter doesn't short circuit.

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+0 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.app.WallpaperManager 
import android.content.res.Resources

import android.graphics.Matrix

import android.graphics.Rect

import android.hardware.devicestate.DeviceStateManager

import android.os.DeadObjectException

import android.os.Handler

import android.os.PowerManager
@@ -55,7 +54,6 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController 
import com.android.systemui.statusbar.phone.BiometricUnlockController

import com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK_FROM_DREAM

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.Utils.isDeviceFoldable

import dagger.Lazy

import javax.inject.Inject
@@ -166,7 +164,6 @@ constructor( 
    private val notificationShadeWindowController: NotificationShadeWindowController,

    private val powerManager: PowerManager,

    private val wallpaperManager: WallpaperManager,

    private val deviceStateManager: DeviceStateManager,

) : KeyguardStateController.Callback, ISysuiUnlockAnimationController.Stub() {



    interface KeyguardUnlockAnimationListener {
@@ -482,7 +479,6 @@ constructor( 
                "${!notificationShadeWindowController.isLaunchingActivity}",

        )

        Log.wtf(TAG, "  launcherUnlockController != null: ${launcherUnlockController != null}")

        Log.wtf(TAG, "  !isFoldable(context): ${!isDeviceFoldable(resources, deviceStateManager)}")

    }



    /**