Merge "MediaHierarchyManager: prevent crash when previousLocation is -1" into tm-dev

2022-02-25 14:50:30 +00:00
parent 5a53a49803 1a0b343bce
commit 9f4def912b
1 changed files with 5 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt
@@ -785,7 +785,11 @@ class MediaHierarchyManager @Inject constructor(
     * @return true if this transformation is guided by an external progress like a finger
     */
    private fun isCurrentlyInGuidedTransformation(): Boolean {
-        return getTransformationProgress() >= 0
+        return hasValidStartAndEndLocations() && getTransformationProgress() >= 0
+    }
+
+    private fun hasValidStartAndEndLocations(): Boolean {
+        return previousLocation != -1 && desiredLocation != -1
    }

    /**