diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-16 02:44:17 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-16 02:44:17 -0800 |
| commit | 38758bc085194faf24e4ea160b04ef138f3917a1 (patch) | |
| tree | 822c62917dd2dccf4b241a06f68dc0e0dc26f2b3 /src/com | |
| parent | c8d0acd4ee2994cd21626b1407b4626be7cd3b78 (diff) | |
| parent | 187612064c2b35812e38adf25b5f106c72e9fcb2 (diff) | |
| download | android_packages_apps_Gallery2-38758bc085194faf24e4ea160b04ef138f3917a1.tar.gz android_packages_apps_Gallery2-38758bc085194faf24e4ea160b04ef138f3917a1.tar.bz2 android_packages_apps_Gallery2-38758bc085194faf24e4ea160b04ef138f3917a1.zip | |
Merge "Gallery2: Add null pointer judgement for monkey"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/state/StatePanel.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/ui/ExportDialog.java | 1 |
2 files changed, 4 insertions, 1 deletions
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) { |