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

Commit b7943811 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #6242583: ResolverActivity is considered as home activity"

parents e2427cac 2d69d49d

services/java/com/android/server/am/ActivityRecord.java

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