summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-04-06 16:24:14 -0700
committerDianne Hackborn <hackbod@google.com>2012-04-06 16:24:14 -0700
commit2d69d49d30a43f957b9b80b0ac2c27fdf9662771 (patch)
tree498e6041b293e2ec52f79f651905c8b2c149d1bb /services/java
parent29d6fa9d8b651b6940e6f3f9182f5b72c404c739 (diff)
downloadframeworks_base-2d69d49d30a43f957b9b80b0ac2c27fdf9662771.zip
frameworks_base-2d69d49d30a43f957b9b80b0ac2c27fdf9662771.tar.gz
frameworks_base-2d69d49d30a43f957b9b80b0ac2c27fdf9662771.tar.bz2
Fix issue #6242583: ResolverActivity is considered as home activity
Change-Id: Ib29908cdfcbbff769d12df1770264ad13ec5337b
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/am/ActivityRecord.java3
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