commit 77aa9afe0c67ca7285ed81664571f3d6f567eb9b
author Julia Reynolds <juliacr@google.com> Wed May 27 18:28:40 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 27 18:28:42 2015 +0000
tree 62e3fce1457981751f8752d819561500537701dc
parent d0699fa5697ba43c64c142ee67b245e0a346acfe
parent 843f648c821eef6bd1ade3bc3b8a17f94f85129a

Merge "Fallback to priority activity if preferred activity not available." into mnc-dev

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index e63be92..2b6f8e1 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 @@
                 if (preferredComponent != null) {
                     ai = AppGlobals.getPackageManager().getActivityInfo(
                             preferredComponent, flags, userId);
-                } else {
+                }
+                if (ai == null) {
                     ResolveInfo info = AppGlobals.getPackageManager().resolveIntent(
                             intent,
                             intent.resolveTypeIfNeeded(mContext.getContentResolver()),