From 6ba77b4fa5f01644a07a5282c35589d09c782200 Mon Sep 17 00:00:00 2001
From: Jason Hunter <hunterjm@gmail.com>
Date: Sun, 17 Mar 2019 00:22:42 -0400
Subject: [PATCH] Fix HLS on Android 9.0 (#2950)

* make sure can play type is "probably"

* check hls.js first and then native
---
 src/dialogs/more-info/controls/more-info-camera.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/dialogs/more-info/controls/more-info-camera.ts b/src/dialogs/more-info/controls/more-info-camera.ts
index aa2a64688d..3fbc56a727 100644
--- a/src/dialogs/more-info/controls/more-info-camera.ts
+++ b/src/dialogs/more-info/controls/more-info-camera.ts
@@ -58,15 +58,13 @@ class MoreInfoCamera extends UpdatingElement {
     videoEl.muted = true;
 
     // tslint:disable-next-line
-    let Hls: HLSModule | undefined;
-
-    let hlsSupported =
-      videoEl.canPlayType("application/vnd.apple.mpegurl") !== "";
+    const Hls = ((await import(/* webpackChunkName: "hls.js" */ "hls.js")) as any)
+      .default as HLSModule;
+    let hlsSupported = Hls.isSupported();
 
     if (!hlsSupported) {
-      Hls = ((await import(/* webpackChunkName: "hls.js" */ "hls.js")) as any)
-        .default as HLSModule;
-      hlsSupported = Hls.isSupported();
+      hlsSupported =
+        videoEl.canPlayType("application/vnd.apple.mpegurl") !== "";
     }
 
     if (hlsSupported) {
@@ -76,7 +74,7 @@ class MoreInfoCamera extends UpdatingElement {
           this.stateObj.entity_id
         );
 
-        if (Hls) {
+        if (Hls.isSupported()) {
           this._renderHLSPolyfill(videoEl, Hls, url);
         } else {
           this._renderHLSNative(videoEl, url);