summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzdi <zdi@codeaurora.org>2016-02-03 12:37:25 +0800
committerSteve Kondik <steve@cyngn.com>2016-09-26 04:54:48 -0700
commit8ab627048e551b3ba76e67f623db3c94ba63dfcd (patch)
treef0ce35c9174bbd083ec70df74801efb9b6d4b978
parentcdf68d781b1078b06d1d11fea2376837b9c230d7 (diff)
downloadandroid_packages_apps_Gallery2-8ab627048e551b3ba76e67f623db3c94ba63dfcd.tar.gz
android_packages_apps_Gallery2-8ab627048e551b3ba76e67f623db3c94ba63dfcd.tar.bz2
android_packages_apps_Gallery2-8ab627048e551b3ba76e67f623db3c94ba63dfcd.zip
Gallery2: Fix null pointer exception when select "Color".
Add null value check to avoid null pointer exception. Change-Id: I0a284a156abe4947fe70b7a3592278a8052768a6 CRs-Fixed: 970766
-rw-r--r--src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java b/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java
index 98659df38..ec44d7ed8 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java
@@ -176,7 +176,9 @@ public class EditorColorBorder extends ParametricEditor {
c.setColorSet(mBasColors);
}
updateText();
- mControl.updateUI();
+ if (mControl != null) {
+ mControl.updateUI();
+ }
mView.invalidate();
}