summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2016-08-30 17:22:55 +0800
committerjunjiez <junjiez@codeaurora.org>2016-08-30 17:22:55 +0800
commitdd4e594e72e895a7bc6d1982ba17d5fa9b82ca75 (patch)
treec8600c852e5d0c6a5b463d103b748c06f8016e16 /src/com/android/camera/VideoUI.java
parent9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6 (diff)
downloadandroid_packages_apps_Snap-dd4e594e72e895a7bc6d1982ba17d5fa9b82ca75.tar.gz
android_packages_apps_Snap-dd4e594e72e895a7bc6d1982ba17d5fa9b82ca75.tar.bz2
android_packages_apps_Snap-dd4e594e72e895a7bc6d1982ba17d5fa9b82ca75.zip
SnapdragonCamera:Fix NullPointerException in monkey test
When mMenuLayout was null, invoking sendTouchToMenu in VideoUI will cause NullPointerException.Add a judgement to avoid mMenuLayout to be null. Change-Id: I7278d01fe62928efd93fade919ffd474b7ce6ebc CRs-Fixed: 1060918
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
-rw-r--r--src/com/android/camera/VideoUI.java7
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() {