summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2015-01-15 15:58:19 +0800
committerkaiyiz <kaiyiz@codeaurora.org>2015-01-15 15:58:19 +0800
commit23901e48e5b21a6798cc84a5acc32b47a15b3c1e (patch)
tree774a79f403222e6fe7bc1265f0fa06c8ce5558cb /src/com/android/camera/PhotoMenu.java
parentee168be7e40e15c1921b32f6b863ad3843c91bfd (diff)
downloadandroid_packages_apps_Snap-23901e48e5b21a6798cc84a5acc32b47a15b3c1e.tar.gz
android_packages_apps_Snap-23901e48e5b21a6798cc84a5acc32b47a15b3c1e.tar.bz2
android_packages_apps_Snap-23901e48e5b21a6798cc84a5acc32b47a15b3c1e.zip
SnapdragonCamera: Fix null pointer exception in SnapdragonCamera
Null Pointer exception occurred in Camera during monkey test. Add null pointer check before use them. Change-Id: I992f6b8f8dc6b91947ec3e4d703b4e9b72996f67 CRs-Fixed: 780252
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 1aea279a3..f4a4b36ce 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -684,8 +684,11 @@ public class PhotoMenu extends MenuController
@Override
public void onClick(View v) {
addSceneMode();
- View view = mUI.getPreviewMenuLayout().getChildAt(0);
- animateSlideIn(view, previewMenuSize, false);
+ ViewGroup menuLayout = mUI.getPreviewMenuLayout();
+ if (menuLayout != null) {
+ View view = menuLayout.getChildAt(0);
+ animateSlideIn(view, previewMenuSize, false);
+ }
}
});
}
@@ -833,8 +836,11 @@ public class PhotoMenu extends MenuController
@Override
public void onClick(View v) {
addFilterMode();
- View view = mUI.getPreviewMenuLayout().getChildAt(0);
- animateSlideIn(view, previewMenuSize, false);
+ ViewGroup menuLayout = mUI.getPreviewMenuLayout();
+ if (menuLayout != null) {
+ View view = mUI.getPreviewMenuLayout().getChildAt(0);
+ animateSlideIn(view, previewMenuSize, false);
+ }
}
});
}