diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-07-22 14:21:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 14:21:31 +0000 |
| commit | ff21279e2cbe0bdd9c41350b7a204cabf9370377 (patch) | |
| tree | e96a44695e4aa7e60a5b8432241558b74962dc76 /services | |
| parent | 2ba3fec6e0222754d93ed7a491354164d113ad6e (diff) | |
| parent | 25073dd4a8e8efcfe4b0b728ebb98fb7326434c0 (diff) | |
| download | frameworks_base-ff21279e2cbe0bdd9c41350b7a204cabf9370377.zip frameworks_base-ff21279e2cbe0bdd9c41350b7a204cabf9370377.tar.gz frameworks_base-ff21279e2cbe0bdd9c41350b7a204cabf9370377.tar.bz2 | |
Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index e57e3ff..a75cc48 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -617,12 +617,9 @@ final class ActivityStack { for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) { ActivityRecord r = activities.get(activityNdx); if (notCurrentUserTask && (r.info.flags & FLAG_SHOW_FOR_ALL_USERS) == 0) { - return null; + continue; } if (!r.finishing && r.intent.getComponent().equals(cls) && r.userId == userId) { - //Slog.i(TAG, "Found matching class!"); - //dump(); - //Slog.i(TAG, "For Intent " + intent + " bringing to top: " + r.intent); return r; } } |