Fix NPE after capture when camera roll is empty.

Use empty array instead of null.

  bug:10264304

Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258

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.