summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2016-01-09 13:08:19 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:02:35 +0100
commit8a8251e43a2d30a4e0d608f77a790c19c5b59dd5 (patch)
treec494905b48d3d972ff31dd1542b0dc33184ebc34 /src/com/android
parent634d8917802bb5e3cab8bde01663e8f0059593f7 (diff)
downloadandroid_packages_apps_Snap-8a8251e43a2d30a4e0d608f77a790c19c5b59dd5.tar.gz
android_packages_apps_Snap-8a8251e43a2d30a4e0d608f77a790c19c5b59dd5.tar.bz2
android_packages_apps_Snap-8a8251e43a2d30a4e0d608f77a790c19c5b59dd5.zip
CameraActivity: Handle NPE when film strip view is null
Change-Id: I0de4ec0f2cb4653822249ea97e8a07c890fc7231
Diffstat (limited to 'src/com/android')
-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 40ea43107..a7ddfe7c7 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1931,7 +1931,9 @@ public class CameraActivity extends Activity
}
public void setPreviewGestures(PreviewGestures previewGestures) {
- mFilmStripView.setPreviewGestures(previewGestures);
+ if(mFilmStripView != null) {
+ mFilmStripView.setPreviewGestures(previewGestures);
+ }
}
protected long updateStorageSpace() {