Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaHiearchyManager: prevent NPE in updateTargetState()" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-03 12:15:23 +00:00
committed by Android (Google) Code Review
parent f2fe0dbe18 83b263e77e
commit b7cca6b1ff
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt
View File

@@ -741,10 +741,11 @@ class MediaHierarchyManager @Inject constructor(
* Updates the bounds that the view wants to be in at the end of the animation.
*/
private fun updateTargetState() {
if (isCurrentlyInGuidedTransformation() && !isCurrentlyFading()) {
var starthost = getHost(previousLocation)
var endHost = getHost(desiredLocation)
if (isCurrentlyInGuidedTransformation() && !isCurrentlyFading() && starthost != null &&
endHost != null) {
val progress = getTransformationProgress()
var endHost = getHost(desiredLocation)!!
var starthost = getHost(previousLocation)!!
// If either of the hosts are invisible, let's keep them at the other host location to
// have a nicer disappear animation. Otherwise the currentBounds of the state might
// be undefined
@@ -756,8 +757,8 @@ class MediaHierarchyManager @Inject constructor(
val newBounds = endHost.currentBounds
val previousBounds = starthost.currentBounds
targetBounds = interpolateBounds(previousBounds, newBounds, progress)
} else {
val bounds = getHost(desiredLocation)?.currentBounds ?: return
} else if (endHost != null) {
val bounds = endHost.currentBounds
targetBounds.set(bounds)
}
}