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

Commit ecb947c2 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Fixes more @Nullable issues in System UI and WMShell." into udc-qpr-dev

parents 2f4d2d5d 5f107a2b

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ class DesktopTasksController( 
     */

    fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {

        val wct = WindowContainerTransaction()

        wct.setBounds(taskInfo.token, null)

        wct.setBounds(taskInfo.token, Rect())

        shellTaskOrganizer.applyTransaction(wct)

    }

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityViewTransition.kt

+2 −2
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ class KeyguardSecurityViewTransition : Transition() { 
    }



    override fun createAnimator(

        sceneRoot: ViewGroup?,

        sceneRoot: ViewGroup,

        startValues: TransitionValues?,

        endValues: TransitionValues?

    ): Animator? {

        if (sceneRoot == null || startValues == null || endValues == null) {

        if (startValues == null || endValues == null) {

            return null

        }

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardTransitionExecutor.kt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ constructor(val context: Context, val displayTracker: DisplayTracker) { 
        context.startActivity(intent, transition.first.toBundle())

        val runner = RemoteAnimationAdapter(NULL_ACTIVITY_TRANSITION, 0, 0)

        try {

            WindowManagerGlobal.getWindowManagerService()

            checkNotNull(WindowManagerGlobal.getWindowManagerService())

                .overridePendingAppTransitionRemote(runner, displayTracker.defaultDisplayId)

        } catch (e: Exception) {

            Log.e(TAG, "Error overriding clipboard app transition", e)

packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ constructor( 
        if (overrideTransition) {

            val runner = RemoteAnimationAdapter(SCREENSHOT_REMOTE_RUNNER, 0, 0)

            try {

                WindowManagerGlobal.getWindowManagerService()

                checkNotNull(WindowManagerGlobal.getWindowManagerService())

                    .overridePendingAppTransitionRemote(runner, displayTracker.defaultDisplayId)

            } catch (e: Exception) {

                Log.e(TAG, "Error overriding screenshot app transition", e)

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

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ constructor( 
                    )

                }

                try {

                    WindowManagerGlobal.getWindowManagerService().lockNow(/* options= */ null)

                    checkNotNull(WindowManagerGlobal.getWindowManagerService())

                        .lockNow(/* options= */ null)

                } catch (e: RemoteException) {

                    Log.e(

                        TAG,