From 3270ce1a024561b6553017d4d81c6cc95fd95bc3 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Wed, 18 Jan 2023 16:01:22 +0100
Subject: [PATCH] fixed crash on media button event with no active media
 session

---
 CHANGELOG.md                                   |  5 +++++
 android/app/src/main/AndroidManifest.xml       |  9 +++++++++
 .../thibault/aves/MediaPlaybackService.kt      | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 android/app/src/main/kotlin/deckers/thibault/aves/MediaPlaybackService.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3741a684c..33ea43ae2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,16 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Video: optional gestures to adjust brightness/volume
+- TV: improved support for Search, About, Privacy Policy
 
 ### Changed
 
 - Viewer: do not keep max brightness when viewing info
 
+### Fixed
+
+- crash when media button events are triggered with no active media session
+
 ## <a id="v1.7.9"></a>[v1.7.9] - 2023-01-15
 
 ### Added
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 64f920264..5d8bc1ce9 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -213,6 +213,15 @@ This change eventually prevents building the app with Flutter v3.3.3.
             </intent-filter>
         </receiver>
 
+        <service
+            android:name=".MediaPlaybackService"
+            android:exported="true"
+            android:foregroundServiceType="mediaPlayback">
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService" />
+            </intent-filter>
+        </service>
+
         <service
             android:name=".AnalysisService"
             android:description="@string/analysis_service_description"
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/MediaPlaybackService.kt b/android/app/src/main/kotlin/deckers/thibault/aves/MediaPlaybackService.kt
new file mode 100644
index 000000000..ed97c5444
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/MediaPlaybackService.kt
@@ -0,0 +1,18 @@
+package deckers.thibault.aves
+
+import android.os.Bundle
+import android.support.v4.media.MediaBrowserCompat
+import androidx.media.MediaBrowserServiceCompat
+
+// dummy service to handle media button events
+// when there is no active media sessions
+class MediaPlaybackService : MediaBrowserServiceCompat() {
+    override fun onGetRoot(clientPackageName: String, clientUid: Int, rootHints: Bundle?): BrowserRoot? {
+        return null
+    }
+
+    override fun onLoadChildren(parentId: String, result: Result<MutableList<MediaBrowserCompat.MediaItem>>) {
+        val children = mutableListOf<MediaBrowserCompat.MediaItem>()
+        result.sendResult(children)
+    }
+}
\ No newline at end of file