From a3a041d55b2039d52da386647c235e50198e36a3 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 31 May 2012 16:18:21 -0700 Subject: 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 --- services/java/com/android/server/am/ActivityManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services') diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 9d9b5b8..2c8ba22 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -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"); } -- cgit v1.1