commit b272ead9bbc939aabaff721d3195d0c64ed3e349
author Michael Mikhail <michaelmikhil@google.com> Mon Nov 28 21:49:47 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 28 21:49:47 2022 +0000
tree 328c05b4e5e98550a307606afac3fec4ca6122d6
parent 70a74616e9b5e7cb2ae903e724d4a95a2d5d24ea
parent ecd9e0c0878652a7963db664ce68400789b456a0

Merge "Fix media control flash when unlock device" into tm-qpr-dev

packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt

diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt
index cbb670e..b252be1 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt
@@ -799,6 +799,16 @@
         }
 
         if (
+            desiredLocation == LOCATION_QS &&
+                previousLocation == LOCATION_LOCKSCREEN &&
+                statusbarState == StatusBarState.SHADE
+        ) {
+            // This is an invalid transition, can happen when tapping on home control and the UMO
+            // while being on landscape orientation in tablet.
+            return false
+        }
+
+        if (
             statusbarState == StatusBarState.KEYGUARD &&
                 (currentLocation == LOCATION_LOCKSCREEN || previousLocation == LOCATION_LOCKSCREEN)
         ) {