diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-05-17 13:18:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-17 13:18:14 -0700 |
| commit | 23f0ed3d718cae1a3cb31c2e454c39056937866b (patch) | |
| tree | 3069effe06dafb11df4076077f55e060f86f840b /src/com/android/camera/PhotoUI.java | |
| parent | 28b4deda315d054a5f24990319c2b6337ca75e5f (diff) | |
| parent | d1ea78a4ad4222fda51c4bee2695119c81ed7540 (diff) | |
| download | android_packages_apps_Snap-23f0ed3d718cae1a3cb31c2e454c39056937866b.tar.gz android_packages_apps_Snap-23f0ed3d718cae1a3cb31c2e454c39056937866b.tar.bz2 android_packages_apps_Snap-23f0ed3d718cae1a3cb31c2e454c39056937866b.zip | |
Merge "SnapdragonCamera: Add null check before accessing mMenuHelp" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index c736cbc7d..d91f23c31 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -333,8 +333,10 @@ public class PhotoUI implements PieListener, mMenuHelp.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - mMenuHelp.setVisibility(View.GONE); - mMenuHelp = null; + if (mMenuHelp != null) { + mMenuHelp.setVisibility(View.GONE); + mMenuHelp = null; + } } }); } |