Merge "Merge "Don't crash if media metadata isn't available" into rvc-dev am: b9bd296455 am: d4c533f615" into rvc-d1-dev-plus-aosp

2020-03-25 00:08:59 +00:00
parent 446d9380ee c84fba750a
commit cadc083f94
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);