diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-08-28 20:14:42 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-08-28 20:14:42 +0800 |
| commit | d4271821a35c87769b004991793b1928c31b41bc (patch) | |
| tree | 321582d2ba36c8063b43b23100ed36bacbfd682e /src/com/android/camera/ImageManager.java | |
| parent | 0f1e5801cbddffccf95e639b2096dd6c90b6af26 (diff) | |
| download | LegacyCamera-d4271821a35c87769b004991793b1928c31b41bc.zip LegacyCamera-d4271821a35c87769b004991793b1928c31b41bc.tar.gz LegacyCamera-d4271821a35c87769b004991793b1928c31b41bc.tar.bz2 | |
Fix 2059728: NPE in BaseImageList.getCursor
Return an empty image list if the cursor is not available.
Change-Id: Ib9f0b23668da7b3c29d208bd46c020e268a0b7f2
Diffstat (limited to 'src/com/android/camera/ImageManager.java')
| -rw-r--r-- | src/com/android/camera/ImageManager.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/camera/ImageManager.java b/src/com/android/camera/ImageManager.java index db0ccf1..2148e73 100644 --- a/src/com/android/camera/ImageManager.java +++ b/src/com/android/camera/ImageManager.java @@ -327,11 +327,7 @@ public class ImageManager { Uri singleImageUri = param.mSingleImageUri; boolean isEmptyImageList = param.mIsEmptyImageList; - if (cr == null) { - return null; - } - - if (isEmptyImageList) { + if (isEmptyImageList || cr == null) { return new EmptyImageList(); } |