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

Dianne Hackborn · Android (Google) Code Review · commit f0e96de863a0 · 2012-05-31T17:38:42.000-07:00
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -3529,7 +3529,8 @@ void closeSystemDialogsLocked(int callingUid, String reason) {
         
         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");
             }

Original file line number	Diff line number	Diff line change
`@@ -3529,7 +3529,8 @@ void closeSystemDialogsLocked(int callingUid, String reason) {`
`3529`	`3529`
`3530`	`3530`	`for (int i=mMainStack.mHistory.size()-1; i>=0; i--) {`
`3531`	`3531`	`ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);`
`3532`		`- if ((r.info.flags&ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS) != 0) {`
	`3532`	`+ if ((r.info.flags&ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS) != 0`
	`3533`	`+ && (r.intent.getFlags()&Intent.FLAG_ACTIVITY_CLOSE_SYSTEM_DIALOGS) == 0) {`
`3533`	`3534`	`r.stack.finishActivityLocked(r, i,`
`3534`	`3535`	`Activity.RESULT_CANCELED, null, "close-sys");`
`3535`	`3536`	`}`