diff options
author | zhuw <zhuw@codeaurora.org> | 2018-11-26 15:58:22 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-10 18:12:41 -0800 |
commit | f20fb90f55fc069e08e0e4526e9e1c9b34038f24 (patch) | |
tree | 85f5026df201256266c7497b9be253336ecfef6a | |
parent | 0e13f5a5b5098b78d6c446e201f0ef7be8db2d0e (diff) | |
download | android_packages_apps_Gallery2-f20fb90f55fc069e08e0e4526e9e1c9b34038f24.tar.gz android_packages_apps_Gallery2-f20fb90f55fc069e08e0e4526e9e1c9b34038f24.tar.bz2 android_packages_apps_Gallery2-f20fb90f55fc069e08e0e4526e9e1c9b34038f24.zip |
fix monkey force close in showRepresentation
add null pointer filter
Change-Id: I3b9124d490c913e351923d3eeb5f09f8acf4b870
-rwxr-xr-x | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 5c289ce02..bf33b2225 100755 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -1481,6 +1481,9 @@ DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{ } if (TrueScannerActs.SERIALIZATION_NAME.equals(representation.getSerializationName())) { Bitmap b = MasterImage.getImage().getOriginalBitmapHighres(); + if (b == null) { + return; + } int w = b.getWidth(); int h = b.getHeight(); if (w < h) { |