From 843f648c821eef6bd1ade3bc3b8a17f94f85129a Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 27 May 2015 09:01:22 -0400
Subject: Fallback to priority activity if preferred activity not available.

Bug: 21434199
Change-Id: I1f268700219dea7f9ed02bda320923f49a5a3457
---
 services/core/java/com/android/server/am/ActivityManagerService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index e63be928245c..2b6f8e1c5e25 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3427,7 +3427,8 @@ public final class ActivityManagerService extends ActivityManagerNative
                 if (preferredComponent != null) {
                     ai = AppGlobals.getPackageManager().getActivityInfo(
                             preferredComponent, flags, userId);
-                } else {
+                }
+                if (ai == null) {
                     ResolveInfo info = AppGlobals.getPackageManager().resolveIntent(
                             intent,
                             intent.resolveTypeIfNeeded(mContext.getContentResolver()),
-- 
cgit v1.2.3-59-g8ed1b