Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4732660a authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit 'ab3276dd':
  Make an exception for screenshot optimization.
parents 625f3978 ab3276dd

services/java/com/android/server/am/ActivityManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -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) {

































services/java/com/android/server/am/ActivityStack.java



+2
−2






























Original line number
Diff line number
Diff line








@@ -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;