summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorzdi <zdi@codeaurora.org>2016-02-03 12:37:25 +0800
committerzdi <zdi@codeaurora.org>2016-02-03 12:40:15 +0800
commit5b33d0fb95fe800f20ebb1d8bb110c4e283f7d5d (patch)
treecffd0bda57c3090a9148e0066fe2e11a08f9236e /src
parentb13a6ae2441c37688960d3d9115de76e5c2fe5ac (diff)
downloadandroid_packages_apps_Gallery2-5b33d0fb95fe800f20ebb1d8bb110c4e283f7d5d.tar.gz
android_packages_apps_Gallery2-5b33d0fb95fe800f20ebb1d8bb110c4e283f7d5d.tar.bz2
android_packages_apps_Gallery2-5b33d0fb95fe800f20ebb1d8bb110c4e283f7d5d.zip
Gallery2: Fix null pointer exception when select "Color".
Add null value check to avoid null pointer exception. Change-Id: I0a284a156abe4947fe70b7a3592278a8052768a6 CRs-Fixed: 970766
Diffstat (limited to 'src')
-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();
}