diff options
| author | yongga <yongga@codeaurora.org> | 2016-01-11 18:35:28 +0800 |
|---|---|---|
| committer | yongga <yongga@codeaurora.org> | 2016-01-11 18:35:28 +0800 |
| commit | 8f986227a258d691238522d0a11c418f7b14dfb9 (patch) | |
| tree | b1190f867230b3a4d410a953f1a760bd13edab19 /src/com | |
| parent | 24af2c506c4b7ad200669cc951c43f664228eac9 (diff) | |
| download | android_packages_apps_Gallery2-8f986227a258d691238522d0a11c418f7b14dfb9.tar.gz android_packages_apps_Gallery2-8f986227a258d691238522d0a11c418f7b14dfb9.tar.bz2 android_packages_apps_Gallery2-8f986227a258d691238522d0a11c418f7b14dfb9.zip | |
Gallery2: fix a Gallery2 crash when copy images by file manager.
Switch timeline/albums/video quickly when copy images by file manager,
NullpointException occurs because getSubMediaSet() returns null.
Add a null value check.
Change-Id: Ifffd97e700d6ac80d1acf28bf7779c4d01716bb0
CRs-Fixed: 954037
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/data/MediaSet.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/data/MediaSet.java b/src/com/android/gallery3d/data/MediaSet.java index 9f7ffceda..fc43767f7 100644 --- a/src/com/android/gallery3d/data/MediaSet.java +++ b/src/com/android/gallery3d/data/MediaSet.java @@ -235,8 +235,10 @@ public abstract class MediaSet extends MediaObject { start += enumerateMediaItems(consumer, startIndex); int m = getSubMediaSetCount(); for (int i = 0; i < m; i++) { - start += getSubMediaSet(i).enumerateTotalMediaItems( - consumer, startIndex + start); + MediaSet set = getSubMediaSet(i); + if (set != null) { + start += set.enumerateTotalMediaItems(consumer, startIndex + start); + } } return start; } |