diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-16 10:58:02 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-16 10:58:02 -0700 |
| commit | 5be9deb5bfd49899eed1cbcc1367ea8a9213bb62 (patch) | |
| tree | 16e63734bfd28ee5681a0b7fed72f9a3ed36e42b /src/com/android/camera/VideoUI.java | |
| parent | 9728bd8448386fe0592e0dae1d27f8f900a0d29b (diff) | |
| parent | 6c7091a4b9d38693776f54b0a3973342c33c2143 (diff) | |
| download | android_packages_apps_Snap-5be9deb5bfd49899eed1cbcc1367ea8a9213bb62.tar.gz android_packages_apps_Snap-5be9deb5bfd49899eed1cbcc1367ea8a9213bb62.tar.bz2 android_packages_apps_Snap-5be9deb5bfd49899eed1cbcc1367ea8a9213bb62.zip | |
Merge "SnapdragonCamera:Fix NullPointerException in monkey test" into camera.lnx.1.0.c7-dev
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 00f3c705a..c4ff511bf 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -798,8 +798,11 @@ public class VideoUI implements PieRenderer.PieListener, } public boolean sendTouchToMenu(MotionEvent ev) { - View v = mMenuLayout.getChildAt(0); - return v.dispatchTouchEvent(ev); + if (mMenuLayout != null) { + View v = mMenuLayout.getChildAt(0); + return v.dispatchTouchEvent(ev); + } + return false; } public void dismissSceneModeMenu() { |