SnapdragonCamera: Add null check before accessing mMenuHelp

There is a corner case that onClick was triggered right after
mMenuHelp is released. Therefore, add the null check and just
ignore the onClick callback.

Change-Id: Ibff54edfe9976f8355243a740b98a844f85711b0
CRs-Fixed: 1009970

1 files changed, 4 insertions, 2 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index c8e01fea0..d7ad5179f 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;
+                }
             }
         });
     }