diff options
| author | huiyan <huiyan@codeaurora.org> | 2016-06-01 17:21:40 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2016-06-14 14:55:17 +0800 |
| commit | fb818215e1c091d58ddd30bcd9f9eb3f9f264538 (patch) | |
| tree | 1ef13e2abb2f70cbe65ffc8279b210e39791b54b /src/com | |
| parent | 84087c05602f1de2c35cd329c1defc5e25003aa7 (diff) | |
| download | android_packages_apps_Gallery2-fb818215e1c091d58ddd30bcd9f9eb3f9f264538.tar.gz android_packages_apps_Gallery2-fb818215e1c091d58ddd30bcd9f9eb3f9f264538.tar.bz2 android_packages_apps_Gallery2-fb818215e1c091d58ddd30bcd9f9eb3f9f264538.zip | |
Gallery2: Fix null pointer exception from monkey test.
The reference is not instantiated before invoking it.
Determine whether the reference is instantiated before invoking it.
Change-Id: I12560d85c3b14e0466c127f2422ea554e0b50345
CRs-Fixed: 1019470
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/app/TimeLineDataLoader.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/TimeLineDataLoader.java b/src/com/android/gallery3d/app/TimeLineDataLoader.java index 28cb274cd..8fcc4dfde 100644 --- a/src/com/android/gallery3d/app/TimeLineDataLoader.java +++ b/src/com/android/gallery3d/app/TimeLineDataLoader.java @@ -124,7 +124,10 @@ public class TimeLineDataLoader { public MediaItem get(int index) { if (!isActive(index)) { - return mSource.getMediaItem(index, 1).get(0); + ArrayList<MediaItem> items = mSource.getMediaItem(index, 1); + if (items != null && items.size() > 0) { + return items.get(0); + } } return mData[index % mData.length]; } |