From e91551d5e500766bd93592db57c9428776714366 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Mon, 31 Aug 2020 11:22:25 -0400
Subject: [PATCH] Media - Fix sysui crash on media image load

Apps may throw various RuntimeExceptions when requesting a bitmap load
over binder. Catch these so sysui doesn't crash loop.

Fixes: 166647431
Test: use DoubleTwist app
Change-Id: I7918768559afd3cc6c2f77922e1679d09859337d
(cherry picked from commit 5009abe8e89a439947cf99f7a0949b04a98adf62)
---
 .../src/com/android/systemui/media/MediaDataManager.kt       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
index 33475aca0bfbe..ad2bb39ee4533 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
@@ -481,7 +481,10 @@ class MediaDataManager(
                 decoder, info, source -> decoder.isMutableRequired = true
             }
         } catch (e: IOException) {
-            e.printStackTrace()
+            Log.e(TAG, "Unable to load bitmap", e)
+            null
+        } catch (e: RuntimeException) {
+            Log.e(TAG, "Unable to load bitmap", e)
             null
         }
     }