summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2016-01-09 13:08:19 +0100
committerLuK1337 <priv.luk@gmail.com>2016-01-09 13:08:19 +0100
commit532497bda601ebd761144d53fb4c7dd47c4fbdfd (patch)
tree4f20b0b37c85d0334696afb9d7e1b0d840e2e776
parenta4a443b4e2e393d3b0d0e201075a95b02fe0c377 (diff)
downloadandroid_packages_apps_Snap-532497bda601ebd761144d53fb4c7dd47c4fbdfd.tar.gz
android_packages_apps_Snap-532497bda601ebd761144d53fb4c7dd47c4fbdfd.tar.bz2
android_packages_apps_Snap-532497bda601ebd761144d53fb4c7dd47c4fbdfd.zip
CameraActivity: Handle NPE when film strip view is null
Change-Id: I0de4ec0f2cb4653822249ea97e8a07c890fc7231
-rw-r--r--src/com/android/camera/CameraActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 24535a6ac..fe9f8cf32 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1751,7 +1751,9 @@ public class CameraActivity extends Activity
}
public void setPreviewGestures(PreviewGestures previewGestures) {
- mFilmStripView.setPreviewGestures(previewGestures);
+ if(mFilmStripView != null) {
+ mFilmStripView.setPreviewGestures(previewGestures);
+ }
}
protected void updateStorageSpace() {