summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2015-08-19 02:27:04 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-19 02:27:04 +0000
commit8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c (patch)
tree7457074d90d16abe1acfe742501bbb6543c06b69
parente6c029b48d18524dbc107939bb28e8efe46bfb34 (diff)
parentb960e75e52176bc4edc709aba71535b32e2d9970 (diff)
am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit 'b960e75e52176bc4edc709aba71535b32e2d9970': Fix SysUI crash when no metadata is provided
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index accfa5b3c5c9..4da9acd563d5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -374,7 +374,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
Intent intent = getCameraIntent();
ActivityInfo targetInfo = PreviewInflater.getTargetActivityInfo(mContext, intent,
KeyguardUpdateMonitor.getCurrentUser());
- if (targetInfo != null) {
+ if (targetInfo != null && targetInfo.metaData != null) {
String clazz = targetInfo.metaData.getString(
MediaStore.META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE);
if (clazz != null) {