Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd07625 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding... 

am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev

* commit '1aaf7d6c':
  Fixed issue with not finding existing activity for background user
parents 72be5067 1aaf7d6c

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

+1 −4
Original line number Diff line number Diff line
@@ -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;

                }

            }