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

Commit 8b702ede authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Add starting windows while unlocking 

- Modify screen capturing logic a bit such that it can also take a
  screenshot when the display is off.
- Also take snapshot when app visibility is changing without
  proper app transition.
- When unlocking, add strating windows for all visible apps.

Test: Unlock phone.
Test: Have an app that sleeps in onStart, make sure unlocking is
instant.
Bug: 31339431
Change-Id: I953ab6cb30d0d264554fd49a46bdc56e23356d13
parent 9bafc715

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

+6 −0
Original line number Diff line number Diff line
@@ -1795,6 +1795,12 @@ final class ActivityStack extends ConfigurationContainer { 
        }

    }



    void addStartingWindowsForVisibleActivities(boolean taskSwitch) {

        for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {

            mTaskHistory.get(taskNdx).addStartingWindowsForVisibleActivities(taskSwitch);

        }

    }



    /**

     * @return true if the top visible activity wants to occlude the Keyguard, false otherwise

     */

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+11 −0
Original line number Diff line number Diff line
@@ -3229,6 +3229,17 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
        }

    }



    void addStartingWindowsForVisibleActivities(boolean taskSwitch) {

        for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {

            final ArrayList<ActivityStack> stacks = mActivityDisplays.valueAt(displayNdx).mStacks;

            final int topStackNdx = stacks.size() - 1;

            for (int stackNdx = topStackNdx; stackNdx >= 0; --stackNdx) {

                final ActivityStack stack = stacks.get(stackNdx);

                stack.addStartingWindowsForVisibleActivities(taskSwitch);

            }

        }

    }



    void invalidateTaskLayers() {

        mTaskLayersChanged = true;

    }

services/core/java/com/android/server/am/KeyguardController.java

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static com.android.server.wm.AppTransition.TRANSIT_FLAG_KEYGUARD_GOING_AW 
import static com.android.server.wm.AppTransition.TRANSIT_KEYGUARD_GOING_AWAY;

import static com.android.server.wm.AppTransition.TRANSIT_KEYGUARD_OCCLUDE;

import static com.android.server.wm.AppTransition.TRANSIT_KEYGUARD_UNOCCLUDE;

import static com.android.server.wm.AppTransition.TRANSIT_NONE;

import static com.android.server.wm.AppTransition.TRANSIT_UNSET;



import android.os.IBinder;
@@ -120,6 +121,7 @@ class KeyguardController { 


                // Some stack visibility might change (e.g. docked stack)

                mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);

                mStackSupervisor.addStartingWindowsForVisibleActivities(true /* taskSwitch */);

                mWindowManager.executeAppTransition();

            } finally {

                mWindowManager.continueSurfaceLayout();

services/core/java/com/android/server/am/TaskRecord.java

+9 −0
Original line number Diff line number Diff line
@@ -1981,6 +1981,15 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta 
        return rootAffinity != null && getStackId() != PINNED_STACK_ID;

    }



    void addStartingWindowsForVisibleActivities(boolean taskSwitch) {

        for (int activityNdx = mActivities.size() - 1; activityNdx >= 0; --activityNdx) {

            final ActivityRecord r = mActivities.get(activityNdx);

            if (r.visible) {

                r.showStartingWindow(null /* prev */, false /* newTask */, taskSwitch);

            }

        }

    }



    void dump(PrintWriter pw, String prefix) {

        pw.print(prefix); pw.print("userId="); pw.print(userId);

                pw.print(" effectiveUid="); UserHandle.formatUid(pw, effectiveUid);

services/core/java/com/android/server/wm/AppWindowToken.java

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
                // affected.

                mService.getDefaultDisplayContentLocked().getDockedDividerController()

                        .notifyAppVisibilityChanged();

                mService.mTaskSnapshotController.notifyAppVisibilityChanged(this, visible);

            }

        }