Merge "Don't crash if media metadata isn't available" into rvc-dev am: b9bd296455 am: ba87cea780 am: 158fa52236

Change-Id: Id858e299c19c5c9071a54a467e45c06e251065ee
2020-03-25 00:22:15 +00:00
parent 23ec9150b0 158fa52236
commit 4a5565cd21
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardMediaPlayer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardMediaPlayer.java
@@ -114,7 +114,9 @@ public class KeyguardMediaPlayer {
            throw new IllegalStateException("cannot update controls, views not bound");
        }
        if (mediaMetadata == null) {
-            throw new IllegalArgumentException("media metadata was null");
+            mMediaNotifView.setVisibility(View.GONE);
+            Log.d(TAG, "media metadata was null");
+            return;
        }
        mMediaNotifView.setVisibility(View.VISIBLE);