summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author RoboErik <epastern@google.com> 2014-10-15 12:17:43 -0700
committer RoboErik <epastern@google.com> 2014-10-15 12:17:43 -0700
commit421c9df7ff52f8c43fd5356a59702931f39dc029 (patch)
treebdc3fde8ba98904e48fe917b9b73a285120e0096
parentc43caf52a61e56d5ed78f947fc8c299ad5273abf (diff)
Don't call size on a null metadata
bug:18002951 Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
-rw-r--r--services/core/java/com/android/server/media/MediaSessionRecord.java4
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 ebce3adc46f9..921b68b3a226 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);