diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-04-06 17:53:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-06 17:53:59 -0700 |
| commit | b7943811a2dbe602f21b2cce0bfb0458042191b0 (patch) | |
| tree | c8e5bdc9f790ccabef4b0039e006fa2f06472404 /services | |
| parent | e2427cac775390ecae2cd6d0d2ab2a3d6280f2df (diff) | |
| parent | 2d69d49d30a43f957b9b80b0ac2c27fdf9662771 (diff) | |
| download | frameworks_base-b7943811a2dbe602f21b2cce0bfb0458042191b0.zip frameworks_base-b7943811a2dbe602f21b2cce0bfb0458042191b0.tar.gz frameworks_base-b7943811a2dbe602f21b2cce0bfb0458042191b0.tar.bz2 | |
Merge "Fix issue #6242583: ResolverActivity is considered as home activity"
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityRecord.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityRecord.java b/services/java/com/android/server/am/ActivityRecord.java index d60ff2b..a098f18 100644 --- a/services/java/com/android/server/am/ActivityRecord.java +++ b/services/java/com/android/server/am/ActivityRecord.java @@ -16,6 +16,7 @@ package com.android.server.am; +import com.android.internal.app.ResolverActivity; import com.android.server.AttributeCache; import com.android.server.am.ActivityStack.ActivityState; @@ -382,7 +383,7 @@ final class ActivityRecord { _intent.getData() == null && _intent.getType() == null && (intent.getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0 && - !"android".equals(realActivity.getClassName())) { + !ResolverActivity.class.getName().equals(realActivity.getClassName())) { // This sure looks like a home activity! // Note the last check is so we don't count the resolver // activity as being home... really, we don't care about |