diff options
| author | 2015-05-27 09:01:22 -0400 | |
|---|---|---|
| committer | 2015-05-27 09:02:18 -0400 | |
| commit | 843f648c821eef6bd1ade3bc3b8a17f94f85129a (patch) | |
| tree | 0fbcfa9ad5514f6985def1da102e8f67f20130bc | |
| parent | 81c73e121ef2ff44a3916628d9ff11385db85bd6 (diff) | |
Fallback to priority activity if preferred activity not available.
Bug: 21434199
Change-Id: I1f268700219dea7f9ed02bda320923f49a5a3457
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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()), |