SnapdragonCamera:Fix crash when resume BestPhotoUI

Fix some NullPointerException isses and remove the Parcel
inferface of ImageItems, add a new method in
BestPictureActivity for fragments to get ImageItems.

Change-Id: Iaa849876a66b926ca68196c8b0df18fdad1780e7
CRs-Fixed: 1083454

1 files changed, 19 insertions, 11 deletions

diff --git a/src/com/android/camera/BestpictureFragment.java b/src/com/android/camera/BestpictureFragment.java
index 6dc4ebd59..fba2a1f14 100644
--- a/src/com/android/camera/BestpictureFragment.java
+++ b/src/com/android/camera/BestpictureFragment.java
@@ -49,7 +49,6 @@ public class BestpictureFragment extends Fragment {
         BestpictureFragment fragment = new BestpictureFragment();
         Bundle args = new Bundle();
         args.putInt(PARAM_IMAGE_NUM, imageNum);
-        args.putParcelable("imageItems", items);
         fragment.setArguments(args);
         return fragment;
     }
@@ -61,7 +60,7 @@ public class BestpictureFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mImageNum = getArguments().getInt(PARAM_IMAGE_NUM);
-        mImageItems = getArguments().getParcelable("imageItems");
+        mImageItems = ((BestpictureActivity)getActivity()).getImageItems();
     }
 
     @Override
@@ -71,15 +70,18 @@ public class BestpictureFragment extends Fragment {
                 .inflate(R.layout.bestpicture_page, container, false);
         mImageView = (ImageView) rootView.findViewById(R.id.image_view);
         mPictureSelectButton = (ImageView) rootView.findViewById(R.id.picture_select);
-        initSelectButton();
-        mImageView.setImageBitmap(mImageItems.getBitmap(mImageNum));
-        rootView.findViewById(R.id.picture_select).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View v) {
-                mImageItems.toggleImageSelection(mImageNum);
-                initSelectButton();
-            }
-        });
+        if (mImageItems != null) {
+            initSelectButton();
+            mImageView.setImageBitmap(mImageItems.getBitmap(mImageNum));
+            rootView.findViewById(R.id.picture_select).setOnClickListener(
+                    new View.OnClickListener() {
+                @Override
+                public void onClick(final View v) {
+                    mImageItems.toggleImageSelection(mImageNum);
+                    initSelectButton();
+                    }
+            });
+        }
         return rootView;
     }
 
@@ -90,4 +92,10 @@ public class BestpictureFragment extends Fragment {
             mPictureSelectButton.setBackground(getResources().getDrawable(R.drawable.pick_the_best_photo_unselected, null));
         }
     }
+
+    @Override
+    public void onDestroy() {
+        mImageItems = null;
+        super.onDestroy();
+    }
 }
\ No newline at end of file