Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata
This commit is contained in:
RoboErik
2014-10-15 23:39:29 +00:00
committed by Android Git Automerger
parent 522fe28e3d c7be69f1d6
commit 0dfd86e006
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

@@ -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
temp.size(); if (temp != null) {
temp.size();
}
mMetadata = temp; mMetadata = temp;
} }
mHandler.post(MessageHandler.MSG_UPDATE_METADATA); mHandler.post(MessageHandler.MSG_UPDATE_METADATA);