Merge "Don't call size on a null metadata" into lmp-dev (c7be69f1) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaSessionRecord.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -731,7 +731,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
	// This is to guarantee that the underlying bundle is unparceled		// This is to guarantee that the underlying bundle is unparceled
	// before we set it to prevent concurrent reads from throwing an		// before we set it to prevent concurrent reads from throwing an
	// exception		// exception
			if (temp != null) {
	temp.size();		temp.size();
			}
	mMetadata = temp;		mMetadata = temp;
	}		}
	mHandler.post(MessageHandler.MSG_UPDATE_METADATA);		mHandler.post(MessageHandler.MSG_UPDATE_METADATA);