diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-31 16:18:21 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-05-31 16:18:21 -0700 |
| commit | a3a041d55b2039d52da386647c235e50198e36a3 (patch) | |
| tree | 1f5d5954e0cc5cf41fff079dbab5a5b20035e2f0 /services | |
| parent | 3c144c3e69405000f5c7542f20890437a4fb4987 (diff) | |
| download | frameworks_base-a3a041d55b2039d52da386647c235e50198e36a3.zip frameworks_base-a3a041d55b2039d52da386647c235e50198e36a3.tar.gz frameworks_base-a3a041d55b2039d52da386647c235e50198e36a3.tar.bz2 | |
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
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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"); } |