Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f0e96de863a06bbee2aaf2aeb0f586e2a434aa62':
  Maybe fix #6584979: Unable to launch share chooser activity from a Notification action
This commit is contained in:
Dianne Hackborn
2012-05-31 17:41:47 -07:00
committed by Android Git Automerger
parent 3fea64623b f0e96de863
commit ce2907b1b6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/am/ActivityManagerService.java
View File

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