summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2018-03-09 19:57:13 +0800
committerArne Coucheron <arco68@gmail.com>2018-04-17 00:28:31 +0200
commit6aeaf8ad08ec4fac13fe6b71896278bead7552c0 (patch)
tree1973e37d8ef5a24471dc15d5bab843892260cbfb
parent85a785190837fb624b0c574668fe9e1b83d5d6c3 (diff)
downloadandroid_packages_apps_Gallery2-6aeaf8ad08ec4fac13fe6b71896278bead7552c0.tar.gz
android_packages_apps_Gallery2-6aeaf8ad08ec4fac13fe6b71896278bead7552c0.tar.bz2
android_packages_apps_Gallery2-6aeaf8ad08ec4fac13fe6b71896278bead7552c0.zip
Fix null pointer when copy representantion
add filter Change-Id: I624079604210042b47c94ac7ce6bb2b5a070e50d
-rw-r--r--src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index 2bd121641..f5a56897d 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -156,6 +156,7 @@ public class ImagePreset {
}
public void updateOrAddFilterRepresentation(FilterRepresentation rep) {
+ if (rep == null) return;
int pos = getPositionForRepresentation(rep);
if (pos != -1) {
mFilters.elementAt(pos).useParametersFrom(rep);