Commit 5e5997a9 authored Jan 14, 2015 by kaiyiz Committed by Gerrit - the friendly Code Review server Jan 17, 2015

SystemUI: Fix NPE of PreviewInflater during monkey test

PackageManager.resolveActivityAsUser() maybe return null, and
ResolveInfo.activityInfo also may be null.

If one of them is null, it would launch resolver activity. Add null check
refer to SecureCameraLaunchManager.targetWillWaitForCameraAvailable().

CRs-Fixed: 775522

Change-Id: Id94bdd376c0310588fcdb4b9a570ce4fff541bb2

parent a91d385d

packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,9 @@ public class PreviewInflater {
		}
		ResolveInfo resolved = packageManager.resolveActivityAsUser(intent,
		PackageManager.MATCH_DEFAULT_ONLY \| PackageManager.GET_META_DATA, currentUserId);
		if (resolved == null \|\| resolved.activityInfo == null) {
		return true;
		}
		return wouldLaunchResolverActivity(resolved, appList);
		}