am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev

* commit '0dfd86e00656573cdd3e28742e93319c96f6ce15':
  Don't call size on a null metadata

1 files changed, 3 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index ebce3ad..921b68b 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -731,7 +731,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
                 // This is to guarantee that the underlying bundle is unparceled
                 // before we set it to prevent concurrent reads from throwing an
                 // exception
-                temp.size();
+                if (temp != null) {
+                    temp.size();
+                }
                 mMetadata = temp;
             }
             mHandler.post(MessageHandler.MSG_UPDATE_METADATA);