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

Commit a3033abc authored Aug 14, 2023 by Colin Cross Committed by Automerger Merge Worker Aug 14, 2023

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

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

Change-Id: I21658ce77a0d27d6c2ca5672d01e96235891a63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5e60e5d8 ecb947c2

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -275,7 +275,7 @@ class DesktopTasksController(
	*/		*/
	fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {		fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {
	val wct = WindowContainerTransaction()		val wct = WindowContainerTransaction()
	wct.setBounds(taskInfo.token, null)		wct.setBounds(taskInfo.token, Rect())
	shellTaskOrganizer.applyTransaction(wct)		shellTaskOrganizer.applyTransaction(wct)
	}		}

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

+2 −2

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

	override fun createAnimator(		override fun createAnimator(
	sceneRoot: ViewGroup?,		sceneRoot: ViewGroup,
	startValues: TransitionValues?,		startValues: TransitionValues?,
	endValues: TransitionValues?		endValues: TransitionValues?
	): Animator? {		): Animator? {
	if (sceneRoot == null \|\| startValues == null \|\| endValues == null) {		if (startValues == null \|\| endValues == null) {
	return null		return null
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ constructor(val context: Context, val displayTracker: DisplayTracker) {
	context.startActivity(intent, transition.first.toBundle())		context.startActivity(intent, transition.first.toBundle())
	val runner = RemoteAnimationAdapter(NULL_ACTIVITY_TRANSITION, 0, 0)		val runner = RemoteAnimationAdapter(NULL_ACTIVITY_TRANSITION, 0, 0)
	try {		try {
	WindowManagerGlobal.getWindowManagerService()		checkNotNull(WindowManagerGlobal.getWindowManagerService())
	.overridePendingAppTransitionRemote(runner, displayTracker.defaultDisplayId)		.overridePendingAppTransitionRemote(runner, displayTracker.defaultDisplayId)
	} catch (e: Exception) {		} catch (e: Exception) {
	Log.e(TAG, "Error overriding clipboard app transition", e)		Log.e(TAG, "Error overriding clipboard app transition", e)

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,7 @@ constructor(
	if (overrideTransition) {		if (overrideTransition) {
	val runner = RemoteAnimationAdapter(SCREENSHOT_REMOTE_RUNNER, 0, 0)		val runner = RemoteAnimationAdapter(SCREENSHOT_REMOTE_RUNNER, 0, 0)
	try {		try {
	WindowManagerGlobal.getWindowManagerService()		checkNotNull(WindowManagerGlobal.getWindowManagerService())
	.overridePendingAppTransitionRemote(runner, displayTracker.defaultDisplayId)		.overridePendingAppTransitionRemote(runner, displayTracker.defaultDisplayId)
	} catch (e: Exception) {		} catch (e: Exception) {
	Log.e(TAG, "Error overriding screenshot app transition", e)		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	Original line	Diff line number	Diff line
	@@ -227,7 +227,8 @@ constructor(
	)		)
	}		}
	try {		try {
	WindowManagerGlobal.getWindowManagerService().lockNow(/* options= */ null)		checkNotNull(WindowManagerGlobal.getWindowManagerService())
			.lockNow(/* options= */ null)
	} catch (e: RemoteException) {		} catch (e: RemoteException) {
	Log.e(		Log.e(
	TAG,		TAG,