diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-19 02:20:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 02:20:10 +0000 |
| commit | b960e75e52176bc4edc709aba71535b32e2d9970 (patch) | |
| tree | b890778ab3692447570b0e6e9032ef2b803db060 | |
| parent | 27c1a728c8dd5d9b6051d4169eb47ef16c31e5a7 (diff) | |
| parent | 8b8fa3e934e3ddf01790e647b4401dc88b24bf67 (diff) | |
| download | frameworks_base-b960e75e52176bc4edc709aba71535b32e2d9970.zip frameworks_base-b960e75e52176bc4edc709aba71535b32e2d9970.tar.gz frameworks_base-b960e75e52176bc4edc709aba71535b32e2d9970.tar.bz2 | |
am 8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
Fix SysUI crash when no metadata is provided
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java | 2 |
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 accfa5b..4da9acd 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) { |