diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-07-31 22:59:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-31 22:59:36 +0000 |
| commit | 5985c24b9765ddc756bf301d05d6b3e6b32db2d3 (patch) | |
| tree | 3ed859fe6c2ad24e35465cd7aa62deac9fe09127 /TestMediaApp | |
| parent | 14d89a9deda5c576debd05b97318ec81177656e1 (diff) | |
| parent | bb95a3a048dc21a68c2ac0c940d400d4f8f1242a (diff) | |
| download | tests-5985c24b9765ddc756bf301d05d6b3e6b32db2d3.tar.gz | |
Merge "Fix a crash when a given media item is not found" into pi-car-dev
Diffstat (limited to 'TestMediaApp')
| -rw-r--r-- | TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java index d67f157..eb77019 100644 --- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java +++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java @@ -63,7 +63,7 @@ class TmaLibrary { TmaMediaItem getMediaItemById(String mediaId) { TmaMediaItem result = mMediaItemsByMediaId.get(mediaId); // Processing includes only on request allows recursive structures :-) - if (!TextUtils.isEmpty(result.mInclude)) { + if (result != null && !TextUtils.isEmpty(result.mInclude)) { result = result.append(loadAssetFile(result.mInclude).mChildren); } return result; |