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

am 4732660a: am ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev

Browse Source 
* commit '4732660a50f3373812e8ae55cbda264d469bfded':
  Make an exception for screenshot optimization.
This commit is contained in:
Craig Mautner
2013-10-11 12:50:05 -07:00
committed by Android Git Automerger
parent 32f3e15c77 4732660a50
commit 7bc5cdc0e9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6640,6 +6640,10 @@ public final class ActivityManagerService extends ActivityManagerNative
return list;
}
TaskRecord getMostRecentTask() {
return mRecentTasks.get(0);
}
@Override
public List<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum,
int flags, int userId) {

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -674,8 +674,8 @@ final class ActivityStack {
}
TaskRecord tr = who.task;
if (tr.intent != null && (tr.intent.getFlags()
&Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0) {
if (mService.getMostRecentTask() != tr && tr.intent != null &&
(tr.intent.getFlags() & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0) {
// If this task is being excluded from recents, we don't want to take
// the expense of capturing a thumbnail, since we will never show it.
return null;