From 4379d51910fef4f2607d8d90c344689e451f11fa Mon Sep 17 00:00:00 2001
From: Greg Stoll <gstoll@mozilla.com>
Date: Mon, 20 May 2024 13:07:30 +0000
Subject: [PATCH] Bug 1811603 - don't set orientation when going to full-screen
 and playing an element with 0 size r=android-reviewers,tthibaud

The .portrait property is used in MediaSessionFullscreenFeature::setOrientationForTabState and already handles the null case, so just

Differential Revision: https://phabricator.services.mozilla.com/D209447
---
 .../engine/mediasession/MediaSession.kt       |  4 +-
 .../MediaSessionFullscreenFeatureTest.kt      | 42 +++++++++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/mediasession/MediaSession.kt b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/mediasession/MediaSession.kt
index 08051f923b2d..f2548178840c 100644
--- a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/mediasession/MediaSession.kt
+++ b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/mediasession/MediaSession.kt
@@ -29,8 +29,8 @@ class MediaSession {
         val audioTrackCount: Int = 0,
         val videoTrackCount: Int = 0,
     ) {
-        val portrait: Boolean
-            get() = height > width
+        val portrait: Boolean?
+            get() = if (height == 0L && width == 0L) null else height > width
     }
 
     /**
diff --git a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
index b6f055af7df7..ca1800c791d0 100644
--- a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
+++ b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
@@ -109,6 +109,40 @@ class MediaSessionFullscreenFeatureTest {
         verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT)
     }
 
+    @Test
+    fun `GIVEN the currently selected tab plays media with no size WHEN the feature is running THEN orientation is unchanged`() {
+        val activity: Activity = mock()
+        val window: Window = mock()
+        whenever(activity.window).thenReturn(window)
+
+        val elementMetadata = MediaSession.ElementMetadata(width = 0, height = 0)
+        val initialState = BrowserState(
+            tabs = listOf(
+                createTab(
+                    "https://www.mozilla.org",
+                    id = "tab1",
+                    mediaSessionState = MediaSessionState(
+                        mock(),
+                        elementMetadata = elementMetadata,
+                        playbackState = MediaSession.PlaybackState.PLAYING,
+                        fullscreen = true,
+                    ),
+                ),
+            ),
+            selectedTabId = "tab1",
+        )
+        val store = BrowserStore(initialState)
+        val feature = MediaSessionFullscreenFeature(
+            activity,
+            store,
+            null,
+        )
+
+        feature.start()
+
+        verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER)
+    }
+
     @Test
     fun `GIVEN the currently selected tab plays landscape media WHEN it enters fullscreen THEN set orientation to landscape`() {
         val activity: Activity = mock()
@@ -148,7 +182,7 @@ class MediaSessionFullscreenFeatureTest {
     @Config(sdk = [Build.VERSION_CODES.N])
     fun `GIVEN the currently selected tab plays landscape media WHEN it enters pip mode THEN set orientation to unspecified`() {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
-        val elementMetadata = MediaSession.ElementMetadata()
+        val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
             tabs = listOf(
                 createTab(
@@ -187,7 +221,7 @@ class MediaSessionFullscreenFeatureTest {
     @Config(sdk = [Build.VERSION_CODES.N])
     fun `GIVEN the currently selected tab is in pip mode WHEN an external intent arrives THEN set orientation to default`() {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
-        val elementMetadata = MediaSession.ElementMetadata()
+        val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
             tabs = listOf(
                 createTab(
@@ -239,7 +273,7 @@ class MediaSessionFullscreenFeatureTest {
     @Config(sdk = [Build.VERSION_CODES.N])
     fun `GIVEN the currently selected tab is in pip mode WHEN it exits pip mode THEN set orientation to default`() {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
-        val elementMetadata = MediaSession.ElementMetadata()
+        val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
             tabs = listOf(
                 createTab(
@@ -289,7 +323,7 @@ class MediaSessionFullscreenFeatureTest {
     @Config(sdk = [Build.VERSION_CODES.N])
     fun `GIVEN the currently selected tab is in pip mode WHEN a custom tab loads THEN display custom tab in device's current orientation`() {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
-        val elementMetadata = MediaSession.ElementMetadata()
+        val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
             tabs = listOf(
                 createTab(