aboutsummaryrefslogtreecommitdiff
path: root/TestMediaApp
diff options
context:
space:
mode:
authorYabin Huang <yabinh@google.com>2019-07-29 16:58:23 -0700
committerYabin Huang <yabinh@google.com>2019-07-31 22:57:59 +0000
commitbb95a3a048dc21a68c2ac0c940d400d4f8f1242a (patch)
treed9ced877b3c595bb6783d3bce670b55373e9b683 /TestMediaApp
parent8961b919a1fe24e542b173b171c4fdfc1351e147 (diff)
downloadtests-bb95a3a048dc21a68c2ac0c940d400d4f8f1242a.tar.gz
Fix a crash when a given media item is not found
Fixes: 138455442 Test: manual Change-Id: Ib71832a8d04ed721f779a1505332684aa7d11342
Diffstat (limited to 'TestMediaApp')
-rw-r--r--TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java2
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;