Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18761206 authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

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
parent 8fe224d3

src/com/android/gallery3d/filtershow/state/StatePanel.java

+3 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/gallery3d/filtershow/ui/ExportDialog.java

+1 −0
Original line number Diff line number Diff line
@@ -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) {