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

* commit '8b8fa3e934e3ddf01790e647b4401dc88b24bf67':
  Fix SysUI crash when no metadata is provided
This commit is contained in:
Jorim Jaggi
2015-08-19 02:20:10 +00:00
committed by Android Git Automerger

View File

@@ -374,7 +374,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
Intent intent = getCameraIntent(); Intent intent = getCameraIntent();
ActivityInfo targetInfo = PreviewInflater.getTargetActivityInfo(mContext, intent, ActivityInfo targetInfo = PreviewInflater.getTargetActivityInfo(mContext, intent,
KeyguardUpdateMonitor.getCurrentUser()); KeyguardUpdateMonitor.getCurrentUser());
if (targetInfo != null) { if (targetInfo != null && targetInfo.metaData != null) {
String clazz = targetInfo.metaData.getString( String clazz = targetInfo.metaData.getString(
MediaStore.META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE); MediaStore.META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE);
if (clazz != null) { if (clazz != null) {