From 6f29e7fd96f0b49424883b64e9c28ed9aeae26da Mon Sep 17 00:00:00 2001 From: Joey Rizzoli Date: Sun, 11 Dec 2016 20:35:55 +0100 Subject: Snap: prevent NPE when checking if controls are visible Change-Id: Id054ccc9445722bcb08953fd40e43a82bdd13ae2 Signed-off-by: Joey Rizzoli --- src/com/android/camera/CameraActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 4f5d923ac..250e49e8a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -2372,6 +2372,9 @@ public class CameraActivity extends Activity * @return whether controls are visible. */ private boolean arePreviewControlsVisible() { + if (mCurrentModule == null) { + return false; + } return mCurrentModule.arePreviewControlsVisible(); } -- cgit v1.2.3