diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-10 23:15:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-10 23:15:47 -0700 |
| commit | 4f9543ab9769a3e2bca44e1a54d7262dbc947d93 (patch) | |
| tree | a00d2357b59b93d0bfc16e9f9529ab76b1c7bdc4 /src/com/android/camera/PhotoUI.java | |
| parent | cea7d5bfe6694009d7d4fa97e8bedaca8aff3e32 (diff) | |
| parent | 15a6600d68847fc9505fe4a89d252469f80deb7a (diff) | |
| download | android_packages_apps_Snap-4f9543ab9769a3e2bca44e1a54d7262dbc947d93.tar.gz android_packages_apps_Snap-4f9543ab9769a3e2bca44e1a54d7262dbc947d93.tar.bz2 android_packages_apps_Snap-4f9543ab9769a3e2bca44e1a54d7262dbc947d93.zip | |
Merge "SnapdragonCamera: Fixed NPE during camera resume" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 1cf88b50a..09e24a710 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -1067,7 +1067,9 @@ public class PhotoUI implements PieListener, mReviewImage.setVisibility(View.GONE); mOnScreenIndicators.setVisibility(View.VISIBLE); mMenuButton.setVisibility(View.VISIBLE); - mMenu.hideTopMenu(false); + if (mMenu != null) { + mMenu.hideTopMenu(false); + } CameraUtil.fadeOut(mReviewDoneButton); mShutterButton.setVisibility(View.VISIBLE); CameraUtil.fadeOut(mReviewRetakeButton); |