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

Commit 75382944 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow multiple tasks when reviewing permissions"

parents 3e6de26e 751e46ca

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

+2 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ public final class ActiveServices { 


            final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                    | Intent.FLAG_ACTIVITY_MULTIPLE_TASK

                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, r.packageName);

            intent.putExtra(Intent.EXTRA_INTENT, new IntentSender(target));
@@ -1649,6 +1650,7 @@ public final class ActiveServices { 


            final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                    | Intent.FLAG_ACTIVITY_MULTIPLE_TASK

                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, s.packageName);

            intent.putExtra(Intent.EXTRA_REMOTE_CALLBACK, callback);

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

+1 −0
Original line number Diff line number Diff line
@@ -776,6 +776,7 @@ public final class BroadcastQueue { 


            final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                    | Intent.FLAG_ACTIVITY_MULTIPLE_TASK

                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, receivingPackageName);

            intent.putExtra(Intent.EXTRA_INTENT, new IntentSender(target));

services/core/java/com/android/server/wm/ActivityStarter.java

+2 −0
Original line number Diff line number Diff line
@@ -827,6 +827,8 @@ class ActivityStarter { 
                final int flags = intent.getFlags();

                Intent newIntent = new Intent(Intent.ACTION_REVIEW_PERMISSIONS);

                newIntent.setFlags(flags

                        | FLAG_ACTIVITY_NEW_TASK

                        | Intent.FLAG_ACTIVITY_MULTIPLE_TASK

                        | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

                newIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, aInfo.packageName);

                newIntent.putExtra(Intent.EXTRA_INTENT, new IntentSender(target));