diff options
author | Angus Kong <shkong@google.com> | 2013-08-09 17:09:35 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2013-08-09 17:09:35 -0700 |
commit | 81c5992f805517b6dd8937d4ff6b11724b23c228 (patch) | |
tree | cb5d7571ba8eda9c5fff7944490d384e2e3ef9b5 /src/com/android/camera/data | |
parent | 4b2cb93c3f652734c41b4eb7449215178c586e8a (diff) | |
download | android_packages_apps_Snap-81c5992f805517b6dd8937d4ff6b11724b23c228.tar.gz android_packages_apps_Snap-81c5992f805517b6dd8937d4ff6b11724b23c228.tar.bz2 android_packages_apps_Snap-81c5992f805517b6dd8937d4ff6b11724b23c228.zip |
Fix NPE after capture when camera roll is empty.
Use empty array instead of null.
bug:10264304
Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
Diffstat (limited to 'src/com/android/camera/data')
-rw-r--r-- | src/com/android/camera/data/CameraDataAdapter.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java index b125bdc2e..9cf6582b1 100644 --- a/src/com/android/camera/data/CameraDataAdapter.java +++ b/src/com/android/camera/data/CameraDataAdapter.java @@ -54,6 +54,7 @@ public class CameraDataAdapter implements LocalDataAdapter { private LocalData mLocalDataToDelete; public CameraDataAdapter(Drawable placeHolder) { + mImages = new ArrayList<LocalData>(); mPlaceHolder = placeHolder; } @@ -65,7 +66,7 @@ public class CameraDataAdapter implements LocalDataAdapter { @Override public LocalData getLocalData(int dataID) { - if (mImages == null || dataID < 0 || dataID >= mImages.size()) { + if (dataID < 0 || dataID >= mImages.size()) { return null; } @@ -74,9 +75,6 @@ public class CameraDataAdapter implements LocalDataAdapter { @Override public int getTotalNumber() { - if (mImages == null) { - return 0; - } return mImages.size(); } @@ -97,9 +95,6 @@ public class CameraDataAdapter implements LocalDataAdapter { @Override public View getView(Context c, int dataID) { - if (mImages == null) { - return null; - } if (dataID >= mImages.size() || dataID < 0) { return null; } @@ -256,10 +251,6 @@ public class CameraDataAdapter implements LocalDataAdapter { @Override public void insertData(LocalData data) { - if (mImages == null) { - mImages = new ArrayList<LocalData>(); - } - // Since this function is mostly for adding the newest data, // a simple linear search should yield the best performance over a // binary search. |