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

Commit d2cf399e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am ce2907b1: am f0e96de8: Merge "Maybe fix #6584979: Unable to launch share... 

am ce2907b1: am f0e96de8: Merge "Maybe fix #6584979: Unable to launch share chooser activity from a Notification action" into jb-dev

* commit 'ce2907b1':
  Maybe fix #6584979: Unable to launch share chooser activity from a Notification action
parents e56a8e7c ce2907b1

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");

            }