am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided

* commit '8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c': Fix SysUI crash when no metadata is provided
2015-08-19 02:35:26 +00:00
parent 43fdc250fc 8cc1abcb7f
commit 6ac4af0f4b
1 changed files with 1 additions and 1 deletions
--- 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) {