summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2016-01-09 13:08:19 +0100
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:42 +0200
commite07d2aecbb183dac48ce94ef7fd86c39ccd39a51 (patch)
tree4ea4a7d9d8d37b89b4ef0cb58af77ba308efa399 /src
parentd34395d5a54157bad983a12be5bae9411857a4cc (diff)
downloadandroid_packages_apps_Snap-e07d2aecbb183dac48ce94ef7fd86c39ccd39a51.tar.gz
android_packages_apps_Snap-e07d2aecbb183dac48ce94ef7fd86c39ccd39a51.tar.bz2
android_packages_apps_Snap-e07d2aecbb183dac48ce94ef7fd86c39ccd39a51.zip
CameraActivity: Handle NPE when film strip view is null
Change-Id: I0de4ec0f2cb4653822249ea97e8a07c890fc7231
Diffstat (limited to 'src')
-rwxr-xr-xsrc/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 fb0e13170..a3a666f25 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1855,7 +1855,9 @@ public class CameraActivity extends Activity
}
public void setPreviewGestures(PreviewGestures previewGestures) {
- mFilmStripView.setPreviewGestures(previewGestures);
+ if(mFilmStripView != null) {
+ mFilmStripView.setPreviewGestures(previewGestures);
+ }
}
protected long updateStorageSpace() {