summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2017-03-17 01:58:16 -0700
committerjunjiez <junjiez@codeaurora.org>2017-03-21 10:10:01 +0800
commitee6c242c81a3a7c1a8ab129e72567c619138267c (patch)
treee798e83289c1768c7417dab5669ebc134533e843 /src/com/android/camera/PhotoUI.java
parentf8bced500c0f6023cfd36666a1412f03f4e39194 (diff)
downloadandroid_packages_apps_Snap-ee6c242c81a3a7c1a8ab129e72567c619138267c.tar.gz
android_packages_apps_Snap-ee6c242c81a3a7c1a8ab129e72567c619138267c.tar.bz2
android_packages_apps_Snap-ee6c242c81a3a7c1a8ab129e72567c619138267c.zip
Revert "SnapdragonCamera:Fix no recording thumbnail when capture during recording."
This reverts commit 0c38495f9f0aae023de5bdfb0ada2f846000278f. Change-Id: I113f5142fca4bc53163d5de9105fb865b34683b3
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rwxr-xr-xsrc/com/android/camera/PhotoUI.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 84a6f90d0..50b5f64fe 100755
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -1229,7 +1229,9 @@ public class PhotoUI implements PieListener,
mLocationDialog.dismiss();
}
mLocationDialog = null;
- mMenu.animateSlideOutPreviewMenu();
+ if (mMenu != null) {
+ mMenu.animateSlideOutPreviewMenu();
+ }
}
public void initDisplayChangeListener() {