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

Change-Id: Ia3aac1ca697e1b1dac9fe311a33a6ac9bd540df3
2020-03-25 00:09:00 +00:00
parent 35b8403e49 ba87cea780
commit 158fa52236
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);