diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-19 02:35:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 02:35:26 +0000 |
| commit | 6ac4af0f4b31d3e33863263509d5a05bfc84d273 (patch) | |
| tree | ff902917e64d15483d08ce332d98b8bf3d2dcc33 | |
| parent | 43fdc250fcfc0c86613a0be8dbb964d3380ac35c (diff) | |
| parent | 8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c (diff) | |
| download | frameworks_base-6ac4af0f4b31d3e33863263509d5a05bfc84d273.zip frameworks_base-6ac4af0f4b31d3e33863263509d5a05bfc84d273.tar.gz frameworks_base-6ac4af0f4b31d3e33863263509d5a05bfc84d273.tar.bz2 | |
am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c':
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) { |