diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-31 17:41:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-31 17:41:47 -0700 |
| commit | ce2907b1b6bf58cae681f1f009e4b308174c9a1e (patch) | |
| tree | 890198721e7d6edd97d876ed3264a347e3e2af3c /services | |
| parent | 3fea64623bc52f01af451bae9d18129c327300c4 (diff) | |
| parent | f0e96de863a06bbee2aaf2aeb0f586e2a434aa62 (diff) | |
| download | frameworks_base-ce2907b1b6bf58cae681f1f009e4b308174c9a1e.zip frameworks_base-ce2907b1b6bf58cae681f1f009e4b308174c9a1e.tar.gz frameworks_base-ce2907b1b6bf58cae681f1f009e4b308174c9a1e.tar.bz2 | |
am f0e96de8: Merge "Maybe fix #6584979: Unable to launch share chooser activity from a Notification action" into jb-dev
* commit 'f0e96de863a06bbee2aaf2aeb0f586e2a434aa62':
Maybe fix #6584979: Unable to launch share chooser activity from a Notification action
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"); } |