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

Commit acd060d6 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Don\'t finish resolver activity onStop if it is for home intent" into nyc-dev 

am: b2303ddd

* commit 'b2303ddd':
  Don't finish resolver activity onStop if it is for home intent
parents 1b817b66 b2303ddd

core/java/com/android/internal/app/ResolverActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import java.util.List; 
import java.util.Objects;

import java.util.Set;



import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
@@ -507,7 +508,9 @@ public class ResolverActivity extends Activity { 
            mPackageMonitor.unregister();

            mRegistered = false;

        }

        if ((getIntent().getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0 && !isVoiceInteraction()) {

        final Intent intent = getIntent();

        if ((intent.getFlags() & FLAG_ACTIVITY_NEW_TASK) != 0 && !isVoiceInteraction()

                && !mResolvingHome) {

            // This resolver is in the unusual situation where it has been

            // launched at the top of a new task.  We don't let it be added

            // to the recent tasks shown to the user, and we need to make sure