summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoMenu.java
diff options
context:
space:
mode:
authorlikaid <likaid@codeaurora.org>2015-02-05 18:17:42 +0800
committerLikai Ding <likaid@codeaurora.org>2015-02-09 13:53:05 +0800
commit61acac0af66000c914c138d4f759ec33b15b96ff (patch)
tree7f854f3d4ef03ebc4008cbdb0000c9df87ed0d67 /src/com/android/camera/VideoMenu.java
parent926948487fb81d0971c359e2cd7a4b02a0741403 (diff)
downloadandroid_packages_apps_Snap-61acac0af66000c914c138d4f759ec33b15b96ff.tar.gz
android_packages_apps_Snap-61acac0af66000c914c138d4f759ec33b15b96ff.tar.bz2
android_packages_apps_Snap-61acac0af66000c914c138d4f759ec33b15b96ff.zip
SnapdragonCamera: Fix null pointer exception during monkey test
CRs-Fixed: 788421 788422 788437 788445 Change-Id: Ie77a53a73182b6642ce2e9f7de7c4c127e192f51
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
-rw-r--r--src/com/android/camera/VideoMenu.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index b8cb5a1fe..3e6352397 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);
+ }
}
});
}