diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-02-03 05:03:45 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-02-03 05:03:45 -0800 |
| commit | 083ecf6d23dcc29acf950a6a6b15d454aae0e47a (patch) | |
| tree | da9a58608c2384167975e8040cdedfdc17ffab88 /src | |
| parent | 1f168ca8a21f5e6e6ca827c3280c7057da807a6c (diff) | |
| parent | 5b33d0fb95fe800f20ebb1d8bb110c4e283f7d5d (diff) | |
| download | android_packages_apps_Gallery2-083ecf6d23dcc29acf950a6a6b15d454aae0e47a.tar.gz android_packages_apps_Gallery2-083ecf6d23dcc29acf950a6a6b15d454aae0e47a.tar.bz2 android_packages_apps_Gallery2-083ecf6d23dcc29acf950a6a6b15d454aae0e47a.zip | |
Merge "Gallery2: Fix null pointer exception when select "Color"."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java | 4 |
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(); } |