From 187612064c2b35812e38adf25b5f106c72e9fcb2 Mon Sep 17 00:00:00 2001 From: kaiyiz Date: Thu, 18 Dec 2014 17:04:03 +0800 Subject: Gallery2: Add null pointer judgement for monkey The master image's parameters are null, as a result, there is a lot of NullPointerException during Monkey test. Add some judgement before using these parameters, return if null. CRs-Fixed: 770284 Change-Id: Ie8825f920ced2261908c19555173d36fdebca5a1 --- src/com/android/gallery3d/filtershow/state/StatePanel.java | 4 +++- src/com/android/gallery3d/filtershow/ui/ExportDialog.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/gallery3d/filtershow/state/StatePanel.java b/src/com/android/gallery3d/filtershow/state/StatePanel.java index 95c2df991..192400315 100644 --- a/src/com/android/gallery3d/filtershow/state/StatePanel.java +++ b/src/com/android/gallery3d/filtershow/state/StatePanel.java @@ -48,7 +48,9 @@ public class StatePanel extends Fragment { View panel = mMainView.findViewById(R.id.listStates); track = (StatePanelTrack) panel; - track.setAdapter(MasterImage.getImage().getState()); + StateAdapter imageStateAdapter = MasterImage.getImage().getState(); + if (imageStateAdapter == null) return null; + track.setAdapter(imageStateAdapter); mToggleVersionsPanel = (ImageButton) mMainView.findViewById(R.id.toggleVersionsPanel); if (FilterShowHelper.shouldUseVersions()) { if (mToggleVersionsPanel.getVisibility() == View.GONE diff --git a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java index 7fdd36d0f..001e07589 100644 --- a/src/com/android/gallery3d/filtershow/ui/ExportDialog.java +++ b/src/com/android/gallery3d/filtershow/ui/ExportDialog.java @@ -107,6 +107,7 @@ public class ExportDialog extends DialogFragment implements View.OnClickListener mOriginalBounds = MasterImage.getImage().getOriginalBounds(); ImagePreset preset = MasterImage.getImage().getPreset(); + if (mOriginalBounds == null || preset == null) return null; mOriginalBounds = preset.finalGeometryRect(mOriginalBounds.width(), mOriginalBounds.height()); if (preset != null) { -- cgit v1.2.3