diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-09 20:38:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-09 20:38:03 -0800 |
| commit | 564f0bd45b2b33b24235931ae67acaaafab1bc18 (patch) | |
| tree | 61ad6b3798cf7df3260a9dd881bbd2f8633b4944 /src/com/android/camera/VideoMenu.java | |
| parent | 9ffe06150462488e9d879a8847f7e3827d5b074a (diff) | |
| parent | 61acac0af66000c914c138d4f759ec33b15b96ff (diff) | |
| download | android_packages_apps_Snap-564f0bd45b2b33b24235931ae67acaaafab1bc18.tar.gz android_packages_apps_Snap-564f0bd45b2b33b24235931ae67acaaafab1bc18.tar.bz2 android_packages_apps_Snap-564f0bd45b2b33b24235931ae67acaaafab1bc18.zip | |
Merge "SnapdragonCamera: Fix null pointer exception during monkey test"
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 080f31520..63d255715 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -460,9 +460,12 @@ public class VideoMenu extends MenuController @Override public void onClick(View v) { addFilterMode(); - View view = mUI.getPreviewMenuLayout().getChildAt(0); - mUI.adjustOrientation(); - animateSlideIn(view, previewMenuSize, false); + ViewGroup menuLayout = mUI.getPreviewMenuLayout(); + if (menuLayout != null) { + View view = menuLayout.getChildAt(0); + mUI.adjustOrientation(); + animateSlideIn(view, previewMenuSize, false); + } } }); } |