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

Commit a3a041d5 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Maybe fix #6584979: Unable to launch share chooser activity from a Notification action 

Don't count an activity as a system dialog to be closed, if it is the
one that asked to have system dialogs closed.

Change-Id: I60bb194adde78dc3ac0a4d9b0c1dfbabd105e594
parent 3c144c3e

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

+2 −1
Original line number Diff line number Diff line
@@ -3529,7 +3529,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
        

        for (int i=mMainStack.mHistory.size()-1; i>=0; i--) {

            ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);

            if ((r.info.flags&ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS) != 0) {

            if ((r.info.flags&ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS) != 0

                    && (r.intent.getFlags()&Intent.FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS) == 0) {

                r.stack.finishActivityLocked(r, i,

                        Activity.RESULT_CANCELED, null, "close-sys");

            }