Merge "Fixes more @Nullable issues in System UI and WMShell." into udc-qpr-dev
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -227,7 +227,8 @@ constructor(
|
||||
)
|
||||
}
|
||||
try {
|
||||
WindowManagerGlobal.getWindowManagerService().lockNow(/* options= */ null)
|
||||
checkNotNull(WindowManagerGlobal.getWindowManagerService())
|
||||
.lockNow(/* options= */ null)
|
||||
} catch (e: RemoteException) {
|
||||
Log.e(
|
||||
TAG,
|
||||
|
||||
Reference in New Issue
Block a user