Merge AppWindowToken into ActivityRecord
This change kept AppWindowTokenTests as it's originally based on top of
WindowTestBase, and merging that into ActivityRecordTests needs to
change the base class to ActivityTestBase, which requires additional
work and may change test behaviors. Therefore delay that to
follow-up CL.
Bug: 80414790
Test: Existing tests pass.
Change-Id: I6d73975ee77be9817c41b297f067de2d92a68499
diff --git a/core/java/android/app/ITaskStackListener.aidl b/core/java/android/app/ITaskStackListener.aidl
index 0ba1989..06288c0 100644
--- a/core/java/android/app/ITaskStackListener.aidl
+++ b/core/java/android/app/ITaskStackListener.aidl
@@ -158,7 +158,7 @@
* @param activityToken Token of the size compatibility mode activity. It will be null when
* switching to a activity that is not in size compatibility mode or the
* configuration of the activity.
- * @see com.android.server.wm.AppWindowToken#inSizeCompatMode
+ * @see com.android.server.wm.ActivityRecord#inSizeCompatMode
*/
void onSizeCompatModeActivityChanged(int displayId, in IBinder activityToken);
diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json
index 34b3951..8508f7c 100644
--- a/data/etc/services.core.protolog.json
+++ b/data/etc/services.core.protolog.json
@@ -1,30 +1,6 @@
{
"version": "1.0.0",
"messages": {
- "-2146181682": {
- "message": "Releasing screen wakelock, obscured by %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_KEEP_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-2138637148": {
- "message": "Clearing focused app, displayId=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/ActivityDisplay.java"
- },
- "-2109864870": {
- "message": "app-release(): mOuter=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-2086729999": {
- "message": "Removing app token: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"-2072089308": {
"message": "Attempted to add window with token that is a sub-window: %s. Aborting.",
"level": "WARN",
@@ -37,234 +13,48 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-2024464438": {
- "message": "app-onAnimationFinished(): mOuter=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-2012562539": {
- "message": "startAnimation(): Notify animation start:",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-2002500255": {
- "message": "Defer removing snapshot surface in %dms",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/TaskSnapshotSurface.java"
- },
- "-1991255017": {
- "message": "Drawing snapshot surface sizeMismatch=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/TaskSnapshotSurface.java"
- },
"-1976930686": {
"message": "Attempted to add Accessibility overlay window with bad token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1963461591": {
- "message": "Removing %s from %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-1958209312": {
- "message": "Clear freezing of %s: hidden=%b freezing=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/ActivityRecord.java"
- },
- "-1953668890": {
- "message": "Can't start recents animation, nextAppTransition=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
"-1949279037": {
"message": "Attempted to add input method window with bad token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1939358269": {
- "message": "mRecentScreenshotAnimator finish",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "-1938839202": {
- "message": "SURFACE LEAK DESTROY: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
"-1915280162": {
"message": "Attempted to add wallpaper window with bad token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1886298021": {
- "message": "setAppStartingWindow: token=%s pkg=%s transferFrom=%s newTask=%b taskSwitch=%b processRunning=%b allowTaskSnapshot=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/ActivityRecord.java"
- },
- "-1884933373": {
- "message": "enableScreenAfterBoot: mDisplayEnabled=%b mForceDisplayEnabled=%b mShowingBootMessages=%b mSystemBooted=%b. %s",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-1872288685": {
- "message": "applyAnimation: anim=%s nextAppTransition=%s transit=%s isEntrance=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "-1868124841": {
- "message": "screenOnEarly=%b, awake=%b, currentAppOrientation=%d, orientationSensorEnabled=%b, keyguardDrawComplete=%b, windowManagerDrawComplete=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "-1862269827": {
- "message": "applyAnimation: anim=%s transit=%s isEntrance=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
"-1838803135": {
"message": "Attempted to set windowing mode to a display that does not exist: %d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1836092044": {
- "message": "Creating SnapshotStartingData",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1824578273": {
- "message": "Reporting new frame to %s: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_RESIZE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-1822611824": {
- "message": "\tRemove token=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-1797409732": {
- "message": "Skipping %s because %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
"-1770075711": {
"message": "Adding window client %s that is dead, aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1768557332": {
- "message": "removeWallpaperAnimation()",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
"-1750206390": {
"message": "Exception thrown when creating surface for client %s (%s). %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1747461042": {
- "message": "set mOrientationChanging of %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-1741065110": {
- "message": "No app is requesting an orientation, return %d for display id=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "-1736245181": {
- "message": "Tried to remove starting window but startingWindow was null: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1730156332": {
- "message": "Display id=%d rotation changed to %d from %d, lastOrientation=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "-1710206702": {
- "message": "Display id=%d is frozen while keyguard locked, return %d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
"-1661704580": {
"message": "Attempted to set replacing window on non-existing app token %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1661404819": {
- "message": "applyAnimation: atoken=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1632122349": {
- "message": "Changing surface while display frozen: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-1597650595": {
- "message": "removeAppToken: %s delayed=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1596995693": {
- "message": "startAnimation",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-1587841219": {
- "message": "Focus moving from %s to %s displayId=%d",
- "level": "INFO",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-1568331821": {
- "message": "Enabling listeners",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "-1561845439": {
- "message": "reParentWindowToken: removing window token=%s from task=%s",
- "level": "INFO",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"-1545962566": {
"message": "View server did not start",
"level": "WARN",
@@ -277,306 +67,54 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1524305318": {
- "message": "Nulling last startingData",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1519226370": {
- "message": "startingData was nulled out before handling mAddStartingWindow: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1515151503": {
- "message": ">>> OPEN TRANSACTION removeReplacedWindows",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "-1497837552": {
- "message": "onAnimationFinished(): mPendingAnimations=%d",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-1483752006": {
- "message": " THUMBNAIL %s: CREATE",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/AppWindowThumbnail.java"
- },
- "-1470632028": {
- "message": "Marking app token %s with replacing windows.",
- "level": "DEBUG",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"-1455600136": {
"message": "Attempted to add Dream window with unknown token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1448427933": {
- "message": "startingWindow was set but startingSurface==null, couldn't remove",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"-1443029505": {
"message": "SAFE MODE ENABLED (menu=%d s=%d dpad=%d trackball=%d)",
"level": "INFO",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1434147454": {
- "message": "cleanupAnimation(): Notify animation finished mPendingAnimations=%d reorderMode=%d",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "-1427184084": {
- "message": "addWindow: New client %s: window=%s Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-1413901262": {
- "message": "startRecentsActivity(): intent=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "-1391944764": {
- "message": "SURFACE DESTROY: %s. %s",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
"-1389772804": {
"message": "Attempted to add voice interaction window with bad token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1350198040": {
- "message": "hideBootMessagesLocked: mDisplayEnabled=%b mForceDisplayEnabled=%b mShowingBootMessages=%b mSystemBooted=%b. %s",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-1318134223": {
- "message": "No longer Stopped: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"-1270731689": {
"message": "Attempted to set replacing window on app token with no content %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1270148832": {
- "message": "Resize start waiting for draw, mDrawState=DRAW_PENDING in %s, surfaceController %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_RESIZE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
"-1263554915": {
"message": "Attempted to add Dream window with bad token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1259022216": {
- "message": "SURFACE HIDE ( %s ): %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "-1257821162": {
- "message": "OUT SURFACE %s: copied",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-1219773477": {
- "message": "setInputConsumerEnabled(%s): mCanceled=%b",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "-1207757583": {
- "message": "startAnimation(): Notify animation start: %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "-1176488860": {
- "message": "SURFACE isSecure=%b: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "-1156118957": {
- "message": "Updated config=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "-1144293044": {
- "message": "SURFACE SET FREEZE LAYER: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "-1130891072": {
- "message": "Orientation continue waiting for draw in %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "-1130868271": {
- "message": "Resizing %s WITH DRAW PENDING",
- "level": "INFO",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-1117599386": {
- "message": "Deferring rotation, display is not enabled.",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
"-1113134997": {
"message": "Attempted to add application window with unknown token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1103716954": {
- "message": "Not removing %s due to exit animation",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-1103115659": {
- "message": "Performing post-rotate rotation",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "-1099052739": {
- "message": "\tAdd token=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-1097148233": {
- "message": "commitVisibility: %s: hidden=%b hiddenRequested=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1089874824": {
- "message": "SURFACE SHOW (performLayout): %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "-1077196445": {
- "message": "Add starting %s: startingData=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-1076978367": {
- "message": "thawRotation: mRotation=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"-1060365734": {
"message": "Attempted to add QS dialog window with bad token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1047945589": {
- "message": "Remove client=%x, surfaceController=%s Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-1044506655": {
- "message": "New transit away from wallpaper: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
"-1042574499": {
"message": "Attempted to add Accessibility overlay window with unknown token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-1009117329": {
- "message": "isFetchingAppTransitionSpecs=true",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "-1001633850": {
- "message": "Removing focused app token:%s displayId=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-993378225": {
- "message": "finishDrawingLocked: mDrawState=COMMIT_DRAW_PENDING %s in %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_DRAW",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "-986746907": {
- "message": "Starting window removed %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-979259577": {
- "message": "setAppVisibility(%s, visible=%b): %s hidden=%b hiddenRequested=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-955458843": {
- "message": "Set freezing of %s: hidden=%b freezing=%b hiddenRequested=%b. %s",
- "level": "INFO",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-953872371": {
- "message": "setClientHidden: %s clientHidden=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-928291778": {
- "message": "applyAnimation: anim=%s nextAppTransition=%d transit=%s Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "-916108501": {
- "message": "Adding %s to %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
"-914253865": {
"message": "Attempted to add voice interaction window with unknown token %s. Aborting.",
"level": "WARN",
@@ -589,198 +127,36 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-874446906": {
- "message": "showBootMessage: msg=%s always=%b mAllowBootMessages=%b mShowingBootMessages=%b mSystemBooted=%b. %s",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"-861859917": {
"message": "Attempted to add window to a display that does not exist: %d. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-861707633": {
- "message": "Destroying surface %s called by %s",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "-856025122": {
- "message": "SURFACE transparentRegionHint=%s: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-853404763": {
- "message": "\twallpaper=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
"-853226675": {
"message": "Attempted to add window with exiting application token .%s Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-809771899": {
- "message": "findFocusedWindow: Reached focused app=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "-807062773": {
- "message": "Aborted starting %s: removed=%b startingData=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-793346159": {
- "message": "New transit into wallpaper: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
"-784959154": {
"message": "Attempted to add private presentation window to a non-private display. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-783405930": {
- "message": "Performing post-rotate rotation",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-771282525": {
- "message": "Losing focus: %s",
- "level": "INFO",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-760801764": {
- "message": "onAnimationCancelled",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/WallpaperAnimationAdapter.java"
- },
- "-754503024": {
- "message": "Relayout %s: oldVis=%d newVis=%d. %s",
- "level": "INFO",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"-747671114": {
"message": "Failed looking up window callers=%s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-714291355": {
- "message": "Losing delayed focus: %s",
- "level": "INFO",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-694710814": {
- "message": "Pausing rotation during drag",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DragState.java"
- },
- "-687185281": {
- "message": "New topFocusedDisplayId=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "-666510420": {
- "message": "With display frozen, orientationChangeComplete=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "-666419717": {
- "message": "Creating animation bounds layer",
- "level": "INFO",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-653156702": {
- "message": "createAppAnimations()",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "-650040763": {
- "message": "rotationForOrientation(orient=%d, last=%d); user=%d %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "-635082269": {
- "message": "******** booted=%b msg=%b haveBoot=%b haveApp=%b haveWall=%b wallEnabled=%b haveKeyguard=%b",
- "level": "INFO",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "-622997754": {
- "message": "postWindowRemoveCleanupLocked: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-618015844": {
- "message": "performEnableScreen: mDisplayEnabled=%b mForceDisplayEnabled=%b mShowingBootMessages=%b mSystemBooted=%b mOnlyCore=%b. %s",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"-583031528": {
"message": "%s",
"level": "INFO",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-576070986": {
- "message": "Performing post-rotate rotation after seamless rotation",
- "level": "INFO",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "-573268667": {
- "message": "applyAnimation: transition animation is disabled or skipped. atoken=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-554834595": {
- "message": "Display id=%d is frozen, return %d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "-549028919": {
- "message": "enableScreenIfNeededLocked: mDisplayEnabled=%b mForceDisplayEnabled=%b mShowingBootMessages=%b mSystemBooted=%b. %s",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-545190927": {
- "message": "<<< CLOSE TRANSACTION animate",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowAnimator.java"
- },
- "-519504830": {
- "message": "applyAnimation: anim=%s nextAppTransition=ANIM_CUSTOM transit=%s isEntrance=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
"-507657818": {
"message": "Window %s is already added",
"level": "WARN",
@@ -793,54 +169,6 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-481924678": {
- "message": "handleNotObscuredLocked w: %s, w.mHasSurface: %b, w.isOnScreen(): %b, w.isDisplayedLw(): %b, w.mAttrs.userActivityTimeout: %d",
- "level": "DEBUG",
- "group": "WM_DEBUG_KEEP_SCREEN_ON",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "-477481651": {
- "message": "SURFACE DESTROY PENDING: %s. %s",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "-445944810": {
- "message": "finish(%b): mCanceled=%b",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "-444624452": {
- "message": "REPARENT from: %s to: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "-439951996": {
- "message": "Disabling listeners",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "-415912575": {
- "message": "setTask: %s at top.",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/ActivityRecord.java"
- },
- "-415865166": {
- "message": "findFocusedWindow: Found new focus @ %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "-405536909": {
- "message": "Removing snapshot surface",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/TaskSnapshotSurface.java"
- },
"-393505149": {
"message": "unable to update pointer icon",
"level": "WARN",
@@ -853,198 +181,42 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-379068494": {
- "message": "unknownApps is not empty: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "-371630969": {
- "message": "New wallpaper target=%s, oldWallpaper=%s, openingApps=%s, closingApps=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "-367797467": {
- "message": "Creating SplashScreenStartingData",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-344488673": {
- "message": "Finishing drawing window %s: mDrawState=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "-336658140": {
- "message": "Checking theme of starting window: 0x%x",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-324085783": {
- "message": "SURFACE CROP %s: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
"-322035974": {
"message": "App freeze timeout expired.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-320419645": {
- "message": "Removing replaced window: %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-198463978": {
- "message": "updateRotationUnchecked: alwaysSendConfiguration=%b forceRelayout=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-193782861": {
- "message": "Final remove of window: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_WINDOW_MOVEMENT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"-167822951": {
"message": "Attempted to add starting window to token with already existing starting window",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-129722369": {
- "message": "New transit: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "-121104356": {
- "message": "Remove %s: mSurfaceController=%s mAnimatingExit=%b mRemoveOnExit=%b mHasSurface=%b surfaceShowing=%b animating=%b app-animation=%b mWillReplaceWindow=%b inPendingTransaction=%b mDisplayFrozen=%b callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "-116086365": {
- "message": "******************** ENABLING SCREEN!",
- "level": "INFO",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-106400104": {
- "message": "Preload recents with %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "-104758113": {
- "message": "Removing app %s delayed=%b animation=%s animating=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-96848838": {
- "message": "Gaining focus: %s",
- "level": "INFO",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "-87705714": {
- "message": "findFocusedWindow: focusedApp=null using new focus @ %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
"-87703044": {
"message": "Boot completed: SurfaceFlinger is dead!",
"level": "ERROR",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "-86763148": {
- "message": " KILL SURFACE SESSION %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/Session.java"
- },
- "-34965929": {
- "message": "Moving pending starting from %s to %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "-29233992": {
- "message": "SURFACE CLEAR CROP: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "-7343917": {
- "message": "onAnimationFinished(): targetStack=%s targetActivity=%s mRestoreTargetBehindStack=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "9803449": {
- "message": "startFreezingDisplayLocked: exitAnim=%d enterAnim=%d called by %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "10608884": {
- "message": " FREEZE %s: CREATE",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/ScreenRotationAnimation.java"
- },
"11060725": {
"message": "Attempted to get system decors flag of a display that does not exist: %d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "17696244": {
- "message": "startAnimation(): mPendingStart=%b mCanceled=%b",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
"38267433": {
"message": "Attempted to reset replacing window on non-existing app token %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "44171776": {
- "message": "Resetting app token %s of replacing window marks.",
- "level": "DEBUG",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "51200510": {
- "message": " BLACK %s: DESTROY",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/BlackFrame.java"
- },
"51628177": {
"message": "Attempted to get windowing mode of a display that does not exist: %d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "83950285": {
- "message": "removeAnimation(%d)",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
"91350919": {
"message": "Attempted to set IME flag to a display that does not exist: %d",
"level": "WARN",
@@ -1057,222 +229,36 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "95902367": {
- "message": "Relayout of %s: focusMayChange=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "100936473": {
- "message": "Wallpaper animation!",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "115108840": {
- "message": "Removing startingView=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "118187173": {
- "message": "Enqueueing ADD_STARTING",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "123161180": {
- "message": "SEVER CHILDREN",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "150351993": {
- "message": "addWindow: %s startingWindow=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "152914409": {
- "message": " BLACK %s: CREATE layer=%d",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/BlackFrame.java"
- },
- "154699456": {
- "message": "Last window, removing starting window %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "173419252": {
- "message": "No thumbnail header bitmap for: %d",
- "level": "DEBUG",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "184362060": {
- "message": "screenshotTask(%d): mCanceled=%b",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "186668272": {
- "message": "Now changing app %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "194124419": {
- "message": "goodToGo(): Animation finished already, canceled=%s mPendingAnimations=%d",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "196230599": {
- "message": "Moving existing starting %s from %s to %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "221540118": {
- "message": "mUserActivityTimeout set to %d",
- "level": "DEBUG",
- "group": "WM_DEBUG_KEEP_SCREEN_ON",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "241961619": {
- "message": "Adding %s to %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowToken.java"
- },
"246676969": {
"message": "Attempted to add window with non-application token .%s Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "248210157": {
- "message": "Finishing remote animation",
- "level": "INFO",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
"254883724": {
"message": "addWindowToken: Attempted to add binder token: %s for already created window token: %s displayId=%d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "255692476": {
- "message": "**** GOOD TO GO",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "269576220": {
- "message": "Resuming rotation after drag",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DragState.java"
- },
- "274773837": {
- "message": "applyAnimation: anim=%s nextAppTransition=ANIM_CLIP_REVEAL transit=%s Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "285317231": {
- "message": "Input focus has changed to %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/InputMonitor.java"
- },
"288485303": {
"message": "Attempted to set remove mode to a display that does not exist: %d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "289967521": {
- "message": "Check opening app=%s: allDrawn=%b startingDisplayed=%b startingMoved=%b isRelaunching()=%b startingWindow=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "292904800": {
- "message": "Deferring rotation, animation in progress.",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "302992539": {
- "message": "addAnimation(%s)",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "309039362": {
- "message": "SURFACE MATRIX [%f,%f,%f,%f]: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "342460966": {
- "message": "DRAG %s: pos=(%d,%d)",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/DragState.java"
- },
- "344795667": {
- "message": "*** APP TRANSITION TIMEOUT. displayId=%d isTransitionSet()=%b mOpeningApps.size()=%d mClosingApps.size()=%d mChangingApps.size()=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "355720268": {
- "message": "stopFreezingDisplayLocked: Unfreezing now",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"371641947": {
"message": "Window Manager Crash %s",
"level": "WTF",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "374972436": {
- "message": "performEnableScreen: Waiting for anim complete",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
+ "372792199": {
+ "message": "Non-null activity for system window of rootType=%d",
+ "level": "WARN",
+ "group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "385096046": {
- "message": "Delaying loss of focus...",
- "level": "INFO",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "399841913": {
- "message": "SURFACE RECOVER DESTROY: %s",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "416664944": {
- "message": "No longer freezing: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "417311568": {
- "message": "onResize: Resizing %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RESIZE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
"424524729": {
"message": "Attempted to add wallpaper window with unknown token %s. Aborting.",
"level": "WARN",
@@ -1285,600 +271,108 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "457951957": {
- "message": "\tNot visible=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/WallpaperAnimationAdapter.java"
- },
- "463993897": {
- "message": "Aborted waiting for drawn: %s",
- "level": "WARN",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "474000473": {
- "message": "No stack above target stack=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "481370485": {
- "message": "Computed rotation=%d for display id=%d based on lastOrientation=%d and oldRotation=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "490877640": {
- "message": "onStackOrderChanged(): stack=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "492980365": {
- "message": "TRANSIT_TASK_OPEN_BEHIND, adding %s to mOpeningApps",
- "level": "DEBUG",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "495032901": {
- "message": "Expected target stack=%s to restored behind stack=%s but it is behind stack=%s",
- "level": "WARN",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "508887531": {
- "message": "applyAnimation voice: anim=%s transit=%s isEntrance=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "557227556": {
- "message": "onAnimationFinished(): Notify animation finished:",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "558823034": {
- "message": "SURFACE isOpaque=%b: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "585096182": {
- "message": "SURFACE isColorSpaceAgnostic=%b: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "594260577": {
- "message": "createWallpaperAnimations()",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "600140673": {
- "message": "checkBootAnimationComplete: Waiting for anim complete",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "608694300": {
- "message": " NEW SURFACE SESSION %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/Session.java"
- },
"620368427": {
"message": "******* TELLING SURFACE FLINGER WE ARE BOOTED!",
"level": "INFO",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "628276090": {
- "message": "Delaying app transition for screen rotation animation to finish",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
"631792420": {
"message": "Attempted to add window with token that is not a window: %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "633654009": {
- "message": "SURFACE POS (setPositionInTransaction) @ (%f,%f): %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "644675193": {
- "message": "Real start recents",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "646155519": {
- "message": "Started intent=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
"662572728": {
"message": "Attempted to add a toast window with bad token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "665256544": {
- "message": "All windows drawn!",
- "level": "DEBUG",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "668425960": {
- "message": "Notify removed startingWindow %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"676824470": {
"message": "Test completed successfully: %b %d %o %x %e %g %f %% %s.",
"level": "ERROR",
"group": "TEST_GROUP",
"at": "com\/android\/server\/wm\/ProtoLogGroup.java"
},
- "685047360": {
- "message": "Resizing window %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_RESIZE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "690411811": {
- "message": "goodToGo(): No apps to animate",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "693423992": {
- "message": "setAnimationLocked: setting mFocusMayChange true",
- "level": "INFO",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
"704998117": {
"message": "Failed to create surface control for %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "745391677": {
- "message": " CREATE SURFACE %s IN SESSION %s: pid=%d format=%d flags=0x%x \/ %s",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "758852025": {
- "message": "Surface returned was null: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "765395228": {
- "message": "onAnimationFinished(): controller=%s reorderMode=%d",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "791468751": {
- "message": "Pausing rotation during re-position",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/TaskPositioner.java"
- },
- "794570322": {
- "message": "Now closing app %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "811802785": {
- "message": "Changing app %s hidden=%b performLayout=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "829434921": {
- "message": "Draw state now committed in %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "835814848": {
- "message": "%s",
- "level": "INFO",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "845234215": {
- "message": "App is requesting an orientation, return %d for display id=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "847534382": {
- "message": "Non-null appWindowToken for system window of rootType=%d",
- "level": "WARN",
- "group": "WM_ERROR",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "853091290": {
- "message": "Moved stack=%s behind stack=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "868946719": {
- "message": "notifyAppResumed: wasStopped=%b %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "873914452": {
- "message": "goodToGo()",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "884043983": {
- "message": "removeDeadWindows: %s",
- "level": "WARN",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "892244061": {
- "message": "Waiting for drawn %s: removed=%b visible=%b mHasSurface=%b drawState=%d",
- "level": "INFO",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"898863925": {
"message": "Attempted to add QS dialog window with unknown token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "913494177": {
- "message": "removeAllWindowsIfPossible: removing win=%s",
- "level": "WARN",
- "group": "WM_DEBUG_WINDOW_MOVEMENT",
- "at": "com\/android\/server\/wm\/WindowToken.java"
- },
- "916191774": {
- "message": "Orientation change complete in %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "917739349": {
- "message": "Set focused app to: %s moveFocusNow=%b displayId=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/ActivityDisplay.java"
- },
"954470154": {
"message": "FORCED DISPLAY SCALING DISABLED",
"level": "INFO",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "990058731": {
- "message": "notifyAppStopped: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"1001904964": {
"message": "***** BOOT TIMEOUT: forcing display enabled",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1004585481": {
- "message": "%s forcing orientation to %d for display id=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "1021057640": {
- "message": "Marking app token %s with replacing child windows.",
- "level": "DEBUG",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "1051545910": {
- "message": "Exit animation finished in %s: remove=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "1073230342": {
- "message": "startAnimation",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/WallpaperAnimationAdapter.java"
- },
- "1089714158": {
- "message": " FREEZE %s: DESTROY",
- "level": "INFO",
- "group": "WM_SHOW_SURFACE_ALLOC",
- "at": "com\/android\/server\/wm\/ScreenRotationAnimation.java"
- },
- "1108406230": {
- "message": "stopFreezingDisplayLocked: Returning mWaitingForConfig=%b, mAppsFreezingScreen=%d, mWindowsFreezingScreen=%d, mClientFreezingScreen=%b, mOpeningApps.size()=%d",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "1112047265": {
- "message": "finishDrawingWindow: %s mDrawState=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"1115417974": {
"message": "FORCED DISPLAY SIZE: %dx%d",
"level": "INFO",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1140424002": {
- "message": "Finished screen turning on...",
- "level": "INFO",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/DisplayPolicy.java"
- },
- "1160771501": {
- "message": "Resize reasons for w=%s: %s surfaceResized=%b configChanged=%b dragResizingChanged=%b reportOrientationChanged=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_RESIZE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "1166381079": {
- "message": "Execute app transition: %s, displayId: %d Callers=%s",
- "level": "WARN",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "1195433019": {
- "message": "Clearing startingData for token=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"1208313423": {
"message": "addWindowToken: Attempted to add token: %s for non-exiting displayId=%d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1219600119": {
- "message": "addWindow: win=%s Callers=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_FOCUS",
- "at": "com\/android\/server\/wm\/WindowToken.java"
- },
- "1220075598": {
- "message": "SURFACE SIZE %dx%d: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowSurfaceController.java"
- },
- "1224307091": {
- "message": "checkBootAnimationComplete: Animation complete!",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "1244668962": {
- "message": "Added starting %s: startingWindow=%s startingView=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "1288731814": {
- "message": "WindowState.hideLw: setting mFocusMayChange true",
- "level": "INFO",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
"1325649102": {
"message": "Bad requesting window %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1329340614": {
- "message": "Orientation not waiting for draw in %s, surfaceController %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
"1331177619": {
"message": "Attempted to add a toast window with unknown token %s. Aborting.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1358462645": {
- "message": "Looking for focus: %s, flags=%d, canReceive=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "1401700824": {
- "message": "Window drawn win=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "1404220922": {
- "message": "Translucent=%s Floating=%s ShowWallpaper=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "1422781269": {
- "message": "Resuming rotation after re-position",
- "level": "DEBUG",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/TaskPositioner.java"
- },
"1423418408": {
"message": "unable to restore pointer icon",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1423592961": {
- "message": "<<< CLOSE TRANSACTION removeReplacedWindows",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "1430336882": {
- "message": "findFocusedWindow: focusedApp windows not focusable using new focus @ %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
"1434383382": {
"message": "Attempted to get flag of a display that does not exist: %d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1448683958": {
- "message": "Override pending remote transitionSet=%b adapter=%s",
- "level": "INFO",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "1457990604": {
- "message": "applyAnimation: anim=%s nextAppTransition=ANIM_CUSTOM_IN_PLACE transit=%s Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "1469292670": {
- "message": "Changing focus from %s to %s displayId=%d Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "1495525537": {
- "message": "createWallpaperAnimations()",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "1496418389": {
- "message": "Removing starting %s from %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "1497304204": {
- "message": "Deferring rotation, rotation is paused.",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "1504168072": {
- "message": "removeIfPossible: %s callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
"1518495446": {
"message": "removeWindowToken: Attempted to remove non-existing token: %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1519757176": {
- "message": "setHomeApp(%s)",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
"1521476038": {
"message": "Attempted to set flag to a display that does not exist: %d",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1525976603": {
- "message": "cancelAnimation(): reason=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
- },
- "1531527061": {
- "message": "createAnimationAdapter(): token=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
"1563755163": {
"message": "Permission Denial: %s from pid=%d, uid=%d requires %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1573332272": {
- "message": "Display id=%d selected orientation %d, got rotation %d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "1577579529": {
- "message": "win=%s destroySurfaces: appStopped=%b win.mWindowRemovalAllowed=%b win.mRemoveOnExit=%b",
- "level": "ERROR",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "1589610525": {
- "message": "applyAnimation NEXT_TRANSIT_TYPE_OPEN_CROSS_PROFILE_APPS: anim=%s transit=%s isEntrance=true Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "1628345525": {
- "message": "Now opening app %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "1634557978": {
- "message": "**** Dismissing screen rotation animation",
- "level": "INFO",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "1635462459": {
- "message": "onMovedByResize: Moving %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_RESIZE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "1637745145": {
- "message": "Clear freezing of %s force=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"1720696061": {
"message": "Adding window to Display that has been removed.",
"level": "WARN",
@@ -1891,280 +385,31 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1747941491": {
- "message": "SURFACE controller=%s alpha=%f matrix=[%f*%f,%f*%f][%f*%f,%f*%f]: %s",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "1756082882": {
- "message": "Orientation change skips hidden %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
- },
- "1762317752": {
- "message": "Expected target stack=%s to be top most but found stack=%s",
- "level": "WARN",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RecentsAnimation.java"
- },
- "1764592478": {
- "message": "reparent: moving app token=%s to task=%d at %d",
- "level": "INFO",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
"1774661765": {
"message": "Devices still not ready after waiting %d milliseconds before attempting to detect safe mode.",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1814552834": {
- "message": "performLayout: App token exiting now removed %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "1836306327": {
- "message": "Skipping set freeze of %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/ActivityRecord.java"
- },
- "1865125884": {
- "message": "finishScreenTurningOn: mAwake=%b, mScreenOnEarly=%b, mScreenOnFully=%b, mKeyguardDrawComplete=%b, mWindowManagerDrawComplete=%b",
- "level": "DEBUG",
- "group": "WM_DEBUG_SCREEN_ON",
- "at": "com\/android\/server\/wm\/DisplayPolicy.java"
- },
- "1865246212": {
- "message": "\tapp=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
"1866772666": {
"message": "SAFE MODE not enabled",
"level": "INFO",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "1878395049": {
- "message": "Loading animation for app transition. transit=%s enter=%b frame=%s insets=%s surfaceInsets=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "1883987026": {
- "message": "removeAppToken make exiting: %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "1891501279": {
- "message": "cancelAnimation(): reason=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "1921821199": {
- "message": "Preserving %s until the new one is added",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "1947239194": {
- "message": "Deferring rotation, still finishing previous rotation",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "1964565370": {
- "message": "Starting remote animation",
- "level": "INFO",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
- },
- "1984470582": {
- "message": "Creating TaskScreenshotAnimatable: task: %s width: %d height: %d",
- "level": "DEBUG",
- "group": "WM_DEBUG_RECENTS_ANIMATIONS",
- "at": "com\/android\/server\/wm\/TaskScreenshotAnimatable.java"
- },
- "1984738415": {
- "message": "Now animating app in place %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "1984782949": {
- "message": ">>> OPEN TRANSACTION animate",
- "level": "INFO",
- "group": "WM_SHOW_TRANSACTIONS",
- "at": "com\/android\/server\/wm\/WindowAnimator.java"
- },
- "1993685727": {
- "message": "Setting mOrientationChangeComplete=true because wtoken %s numInteresting=%d numDrawn=%d",
- "level": "INFO",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "2016061474": {
- "message": "Prepare app transition: transit=%s %s alwaysKeepCurrent=%b displayId=%d Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "2018454757": {
- "message": "WS.removeImmediately: %s Already removed...",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "2028163120": {
- "message": "applyAnimation: anim=%s nextAppTransition=ANIM_SCALE_UP transit=%s isEntrance=%s Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
- },
- "2034780299": {
- "message": "CHECK_IF_BOOT_ANIMATION_FINISHED:",
- "level": "INFO",
- "group": "WM_DEBUG_BOOT",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "2045641491": {
- "message": "Checking %d opening apps (frozen=%b timeout=%b)...",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS",
- "at": "com\/android\/server\/wm\/AppTransitionController.java"
- },
- "2054958632": {
- "message": "Schedule remove starting %s startingWindow=%s startingView=%s Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "2057434754": {
- "message": "\tvisible=%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_REMOTE_ANIMATIONS",
- "at": "com\/android\/server\/wm\/WallpaperAnimationAdapter.java"
- },
- "2076259606": {
- "message": "Finish starting %s: first real window is shown, no animation",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/AppWindowToken.java"
- },
- "2083556954": {
- "message": "Set mOrientationChanging of %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
"2086878461": {
"message": "Could not send command %s with parameters %s. %s",
"level": "WARN",
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "2088592090": {
- "message": "handleNotObscuredLocked: %s was holding screen wakelock but no longer has FLAG_KEEP_SCREEN_ON!!! called by%s",
- "level": "DEBUG",
- "group": "WM_DEBUG_KEEP_SCREEN_ON",
- "at": "com\/android\/server\/wm\/RootWindowContainer.java"
- },
- "2096635066": {
- "message": "Acquiring screen wakelock due to %s",
- "level": "DEBUG",
- "group": "WM_DEBUG_KEEP_SCREEN_ON",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
- "2114149926": {
- "message": "Not removing %s because app died while it's visible",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/WindowState.java"
- },
- "2128604122": {
- "message": "findFocusedWindow: No focusable windows.",
- "level": "VERBOSE",
- "group": "WM_DEBUG_FOCUS_LIGHT",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
- "2128917433": {
- "message": "onProposedRotationChanged, rotation=%d",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/DisplayRotation.java"
- },
- "2137411379": {
- "message": "applyAnimation: anim=%s animAttr=0x%x transit=%s isEntrance=%b Callers=%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
- "at": "com\/android\/server\/wm\/AppTransition.java"
}
},
"groups": {
"TEST_GROUP": {
"tag": "WindowManagetProtoLogTest"
},
- "WM_DEBUG_ADD_REMOVE": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_APP_TRANSITIONS": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_APP_TRANSITIONS_ANIM": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_BOOT": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_DRAW": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_FOCUS": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_FOCUS_LIGHT": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_KEEP_SCREEN_ON": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_ORIENTATION": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_RECENTS_ANIMATIONS": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_REMOTE_ANIMATIONS": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_RESIZE": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_SCREEN_ON": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_STARTING_WINDOW": {
- "tag": "WindowManager"
- },
- "WM_DEBUG_WINDOW_MOVEMENT": {
- "tag": "WindowManager"
- },
"WM_ERROR": {
"tag": "WindowManager"
- },
- "WM_SHOW_SURFACE_ALLOC": {
- "tag": "WindowManager"
- },
- "WM_SHOW_TRANSACTIONS": {
- "tag": "WindowManager"
}
}
}
diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java
index 10415f5..b131ab6 100644
--- a/services/core/java/com/android/server/wm/AccessibilityController.java
+++ b/services/core/java/com/android/server/wm/AccessibilityController.java
@@ -725,7 +725,7 @@
}
private Region getLetterboxBounds(WindowState windowState) {
- final AppWindowToken appToken = windowState.mAppToken;
+ final ActivityRecord appToken = windowState.mActivityRecord;
if (appToken == null) {
return new Region();
}
diff --git a/services/core/java/com/android/server/wm/ActivityDisplay.java b/services/core/java/com/android/server/wm/ActivityDisplay.java
index 673366f..48a7b73 100644
--- a/services/core/java/com/android/server/wm/ActivityDisplay.java
+++ b/services/core/java/com/android/server/wm/ActivityDisplay.java
@@ -1294,14 +1294,14 @@
if (mDisplayContent == null) {
return;
}
- final AppWindowToken newFocus;
+ final ActivityRecord newFocus;
final IBinder token = r.appToken;
if (token == null) {
ProtoLog.v(WM_DEBUG_FOCUS_LIGHT, "Clearing focused app, displayId=%d",
mDisplayId);
newFocus = null;
} else {
- newFocus = mService.mWindowManager.mRoot.getAppWindowToken(token);
+ newFocus = mService.mWindowManager.mRoot.getActivityRecord(token);
if (newFocus == null) {
Slog.w(TAG_WM, "Attempted to set focus to non-existing app token: " + token
+ ", displayId=" + mDisplayId);
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index fb4de01..3853841 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -41,6 +41,10 @@
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.app.WindowConfiguration.ROTATION_UNDEFINED;
+import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
+import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
+import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.app.WindowConfiguration.activityTypeToString;
import static android.content.Intent.ACTION_MAIN;
import static android.content.Intent.CATEGORY_HOME;
@@ -54,14 +58,19 @@
import static android.content.pm.ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE;
import static android.content.pm.ActivityInfo.CONFIG_UI_MODE;
import static android.content.pm.ActivityInfo.CONFIG_WINDOW_CONFIGURATION;
+import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
import static android.content.pm.ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;
import static android.content.pm.ActivityInfo.FLAG_IMMERSIVE;
+import static android.content.pm.ActivityInfo.FLAG_INHERIT_SHOW_WHEN_LOCKED;
import static android.content.pm.ActivityInfo.FLAG_MULTIPROCESS;
import static android.content.pm.ActivityInfo.FLAG_NO_HISTORY;
import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;
import static android.content.pm.ActivityInfo.FLAG_STATE_NOT_NEEDED;
+import static android.content.pm.ActivityInfo.FLAG_TURN_SCREEN_ON;
+import static android.content.pm.ActivityInfo.LAUNCH_MULTIPLE;
import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE;
import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK;
+import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TOP;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_ALWAYS;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_DEFAULT;
import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED;
@@ -72,6 +81,8 @@
import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION;
import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
import static android.content.pm.ActivityInfo.isFixedOrientationLandscape;
import static android.content.pm.ActivityInfo.isFixedOrientationPortrait;
import static android.content.res.Configuration.EMPTY;
@@ -80,14 +91,29 @@
import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
import static android.content.res.Configuration.UI_MODE_TYPE_MASK;
import static android.content.res.Configuration.UI_MODE_TYPE_VR_HEADSET;
+import static android.os.Build.VERSION_CODES.HONEYCOMB;
import static android.os.Build.VERSION_CODES.O;
import static android.os.Process.SYSTEM_UID;
+import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
+import static android.view.Display.COLOR_MODE_DEFAULT;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Display.INVALID_DISPLAY;
import static android.view.Surface.ROTATION_270;
import static android.view.Surface.ROTATION_90;
+import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
+import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
+import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
+import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE;
+import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;
+import static android.view.WindowManager.TRANSIT_TASK_CHANGE_WINDOWING_MODE;
import static android.view.WindowManager.TRANSIT_TASK_CLOSE;
+import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND;
+import static android.view.WindowManager.TRANSIT_UNSET;
+import static android.view.WindowManager.TRANSIT_WALLPAPER_OPEN;
import static com.android.server.am.ActivityRecordProto.APP_WINDOW_TOKEN;
import static com.android.server.am.ActivityRecordProto.FRONT_OF_TASK;
@@ -98,6 +124,8 @@
import static com.android.server.am.ActivityRecordProto.VISIBLE;
import static com.android.server.am.EventLogTags.AM_RELAUNCH_ACTIVITY;
import static com.android.server.am.EventLogTags.AM_RELAUNCH_RESUME_ACTIVITY;
+import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM;
+import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED;
import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING;
import static com.android.server.wm.ActivityStack.ActivityState.FINISHING;
@@ -145,12 +173,51 @@
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE;
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE;
import static com.android.server.wm.ActivityTaskManagerService.getInputDispatchingTimeoutLocked;
+import static com.android.server.wm.AppWindowTokenProto.ALL_DRAWN;
+import static com.android.server.wm.AppWindowTokenProto.APP_STOPPED;
+import static com.android.server.wm.AppWindowTokenProto.CLIENT_HIDDEN;
+import static com.android.server.wm.AppWindowTokenProto.DEFER_HIDING_CLIENT;
+import static com.android.server.wm.AppWindowTokenProto.FILLS_PARENT;
+import static com.android.server.wm.AppWindowTokenProto.FROZEN_BOUNDS;
+import static com.android.server.wm.AppWindowTokenProto.HIDDEN_REQUESTED;
+import static com.android.server.wm.AppWindowTokenProto.HIDDEN_SET_FROM_TRANSFERRED_STARTING_WINDOW;
+import static com.android.server.wm.AppWindowTokenProto.IS_REALLY_ANIMATING;
+import static com.android.server.wm.AppWindowTokenProto.IS_WAITING_FOR_TRANSITION_START;
+import static com.android.server.wm.AppWindowTokenProto.LAST_ALL_DRAWN;
+import static com.android.server.wm.AppWindowTokenProto.LAST_SURFACE_SHOWING;
+import static com.android.server.wm.AppWindowTokenProto.NAME;
+import static com.android.server.wm.AppWindowTokenProto.NUM_DRAWN_WINDOWS;
+import static com.android.server.wm.AppWindowTokenProto.NUM_INTERESTING_WINDOWS;
+import static com.android.server.wm.AppWindowTokenProto.REMOVED;
+import static com.android.server.wm.AppWindowTokenProto.REPORTED_DRAWN;
+import static com.android.server.wm.AppWindowTokenProto.REPORTED_VISIBLE;
+import static com.android.server.wm.AppWindowTokenProto.STARTING_DISPLAYED;
+import static com.android.server.wm.AppWindowTokenProto.STARTING_MOVED;
+import static com.android.server.wm.AppWindowTokenProto.STARTING_WINDOW;
+import static com.android.server.wm.AppWindowTokenProto.THUMBNAIL;
+import static com.android.server.wm.AppWindowTokenProto.WINDOW_TOKEN;
+import static com.android.server.wm.IdentifierProto.HASH_CODE;
+import static com.android.server.wm.IdentifierProto.TITLE;
+import static com.android.server.wm.IdentifierProto.USER_ID;
import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ADD_REMOVE;
+import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS;
+import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS_ANIM;
+import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_FOCUS_LIGHT;
import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION;
import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_STARTING_WINDOW;
import static com.android.server.wm.TaskPersister.DEBUG;
import static com.android.server.wm.TaskPersister.IMAGE_EXTENSION;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;
+import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW_VERBOSE;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
+import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
+import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;
+import static com.android.server.wm.WindowManagerService.logWithStack;
+import static com.android.server.wm.WindowState.LEGACY_POLICY_VISIBILITY;
+import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN;
+import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM;
+import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.END_TAG;
@@ -159,7 +226,9 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.Size;
import android.app.Activity;
+import android.app.ActivityManager;
import android.app.ActivityManager.TaskDescription;
import android.app.ActivityOptions;
import android.app.PendingIntent;
@@ -189,8 +258,11 @@
import android.content.pm.ApplicationInfo;
import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.GraphicBuffer;
+import android.graphics.PixelFormat;
+import android.graphics.Point;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Binder;
@@ -202,6 +274,8 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.SystemClock;
+import android.os.Trace;
+import android.os.UserHandle;
import android.os.storage.StorageManager;
import android.service.voice.IVoiceInteractionSession;
import android.util.ArraySet;
@@ -213,21 +287,36 @@
import android.util.proto.ProtoOutputStream;
import android.view.AppTransitionAnimationSpec;
import android.view.DisplayCutout;
+import android.view.DisplayInfo;
import android.view.IAppTransitionAnimationSpecsFuture;
import android.view.IApplicationToken;
+import android.view.InputApplicationHandle;
+import android.view.RemoteAnimationAdapter;
+import android.view.RemoteAnimationDefinition;
+import android.view.SurfaceControl;
+import android.view.SurfaceControl.Transaction;
+import android.view.WindowManager;
import android.view.WindowManager.LayoutParams;
+import android.view.animation.Animation;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.ResolverActivity;
import com.android.internal.content.ReferrerIntent;
+import com.android.internal.R;
+import com.android.internal.util.ToBooleanFunction;
import com.android.internal.util.XmlUtils;
+import com.android.server.AttributeCache;
+import com.android.server.LocalServices;
import com.android.server.am.AppTimeTracker;
import com.android.server.am.EventLogTags;
import com.android.server.am.PendingIntentRecord;
+import com.android.server.display.color.ColorDisplayService;
+import com.android.server.policy.WindowManagerPolicy;
import com.android.server.protolog.common.ProtoLog;
import com.android.server.uri.UriPermissionOwner;
import com.android.server.wm.ActivityMetricsLogger.WindowingModeTransitionInfoSnapshot;
import com.android.server.wm.ActivityStack.ActivityState;
+import com.android.server.wm.WindowManagerService.H;
import com.google.android.collect.Sets;
@@ -239,16 +328,18 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
+import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
+import java.util.function.Consumer;
/**
* An entry in the history stack, representing an activity.
*/
-final class ActivityRecord extends AppWindowToken {
+final class ActivityRecord extends WindowToken implements WindowManagerService.AppFreezeListener {
private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityRecord" : TAG_ATM;
private static final String TAG_ADD_REMOVE = TAG + POSTFIX_ADD_REMOVE;
private static final String TAG_APP = TAG + POSTFIX_APP;
@@ -277,8 +368,34 @@
// How many activities have to be scheduled to stop to force a stop pass.
private static final int MAX_STOPPING_TO_FORCE = 3;
- // TODO: Move to AppWindowToken?
+ private static final int STARTING_WINDOW_TYPE_NONE = 0;
+ private static final int STARTING_WINDOW_TYPE_SNAPSHOT = 1;
+ private static final int STARTING_WINDOW_TYPE_SPLASH_SCREEN = 2;
+
+ /**
+ * Value to increment the z-layer when boosting a layer during animations. BOOST in l33tsp34k.
+ */
+ @VisibleForTesting static final int Z_BOOST_BASE = 800570000;
+
+ final ActivityTaskManagerService mAtmService;
final ActivityInfo info; // activity info provided by developer in AndroidManifest
+ // Non-null only for application tokens.
+ // TODO: rename to mActivityToken
+ final ActivityRecord.Token appToken;
+ // Which user is this running for?
+ final int mUserId;
+ // The package implementing intent's component
+ // TODO: rename to mPackageName
+ final String packageName;
+ // the intent component, or target of an alias.
+ final ComponentName mActivityComponent;
+ // Has a wallpaper window as a background.
+ // TODO: Rename to mHasWallpaper and also see if it possible to combine this with the
+ // mOccludesParent field.
+ final boolean hasWallpaper;
+ // Input application handle used by the input dispatcher.
+ final InputApplicationHandle mInputApplicationHandle;
+
final int launchedFromPid; // always the pid who started the activity.
final int launchedFromUid; // always the uid who started the activity.
final String launchedFromPackage; // always the package who started the activity.
@@ -348,9 +465,14 @@
boolean visible; // does this activity's window need to be shown?
boolean visibleIgnoringKeyguard; // is this activity visible, ignoring the fact that Keyguard
// might hide this activity?
- // TODO: figureout how to consolidate with the same variable in AppWindowToken.
+ // True if the hidden state of this token was forced to false due to a transferred starting
+ // window.
+ private boolean mHiddenSetFromTransferredStartingWindow;
+ // TODO: figureout how to consolidate with the same variable in ActivityRecord.
private boolean mDeferHidingClient; // If true we told WM to defer reporting to the client
// process that it is hidden.
+ private boolean mLastDeferHidingClient; // If true we will defer setting mClientHidden to true
+ // and reporting to the client that it is hidden.
boolean sleeping; // have we told the activity to sleep?
boolean nowVisible; // is this activity's window visible?
boolean mDrawn; // is this activity's window drawn?
@@ -401,6 +523,188 @@
boolean pendingVoiceInteractionStart; // Waiting for activity-invoked voice session
IVoiceInteractionSession voiceSession; // Voice interaction session for this activity
+ boolean mVoiceInteraction;
+
+ private int mPendingRelaunchCount;
+
+ // True if we are current in the process of removing this app token from the display
+ private boolean mRemovingFromDisplay = false;
+
+ // Flag set while reparenting to prevent actions normally triggered by an individual parent
+ // change.
+ private boolean mReparenting;
+
+ private RemoteAnimationDefinition mRemoteAnimationDefinition;
+
+ private AnimatingActivityRegistry mAnimatingActivityRegistry;
+
+ private Task mLastParent;
+
+ // Have we told the window clients to hide themselves?
+ private boolean mClientHidden;
+
+ boolean firstWindowDrawn;
+ // Last drawn state we reported to the app token.
+ private boolean reportedDrawn;
+ private final WindowState.UpdateReportedVisibilityResults mReportedVisibilityResults =
+ new WindowState.UpdateReportedVisibilityResults();
+
+ private boolean mUseTransferredAnimation;
+
+ /**
+ * @see #currentLaunchCanTurnScreenOn()
+ */
+ private boolean mCurrentLaunchCanTurnScreenOn = true;
+
+ /**
+ * This gets used during some open/close transitions as well as during a change transition
+ * where it represents the starting-state snapshot.
+ */
+ private AppWindowThumbnail mThumbnail;
+ private final Rect mTransitStartRect = new Rect();
+
+ /**
+ * If we are running an animation, this determines the transition type. Must be one of
+ * AppTransition.TRANSIT_* constants.
+ */
+ private int mTransit;
+
+ /**
+ * If we are running an animation, this determines the flags during this animation. Must be a
+ * bitwise combination of AppTransition.TRANSIT_FLAG_* constants.
+ */
+ private int mTransitFlags;
+ /**
+ * This leash is used to "freeze" the app surface in place after the state change, but before
+ * the animation is ready to start.
+ */
+ private SurfaceControl mTransitChangeLeash = null;
+
+ /** Whether our surface was set to be showing in the last call to {@link #prepareSurfaces} */
+ private boolean mLastSurfaceShowing = true;
+
+ private Letterbox mLetterbox;
+
+ /**
+ * The activity is opaque and fills the entire space of this task.
+ * @see WindowContainer#fillsParent()
+ */
+ private boolean mOccludesParent;
+
+ // The input dispatching timeout for this application token in nanoseconds.
+ long mInputDispatchingTimeoutNanos;
+
+ private boolean mShowWhenLocked;
+ private boolean mInheritShownWhenLocked;
+ private boolean mTurnScreenOn;
+
+ /** Have we been asked to have this token keep the screen frozen? */
+ private boolean mFreezingScreen;
+
+ // These are used for determining when all windows associated with
+ // an activity have been drawn, so they can be made visible together
+ // at the same time.
+ // initialize so that it doesn't match mTransactionSequence which is an int.
+ private long mLastTransactionSequence = Long.MIN_VALUE;
+ private int mNumInterestingWindows;
+ private int mNumDrawnWindows;
+ boolean inPendingTransaction;
+ boolean allDrawn;
+ private boolean mLastAllDrawn;
+
+ private boolean mLastContainsShowWhenLockedWindow;
+ private boolean mLastContainsDismissKeyguardWindow;
+
+ /**
+ * A flag to determine if this AR is in the process of closing or entering PIP. This is needed
+ * to help AR know that the app is in the process of closing but hasn't yet started closing on
+ * the WM side.
+ */
+ private boolean mWillCloseOrEnterPip;
+
+ /**
+ * The scale to fit at least one side of the activity to its parent. If the activity uses
+ * 1920x1080, and the actually size on the screen is 960x540, then the scale is 0.5.
+ */
+ private float mSizeCompatScale = 1f;
+ /**
+ * The bounds in global coordinates for activity in size compatibility mode.
+ * @see ActivityRecord#hasSizeCompatBounds()
+ */
+ private Rect mSizeCompatBounds;
+
+ // activity is not displayed?
+ // TODO: rename to mNoDisplay
+ @VisibleForTesting
+ boolean noDisplay;
+ boolean mShowForAllUsers;
+ // TODO: Make this final
+ int mTargetSdk;
+
+ // Set to true when this app creates a surface while in the middle of an animation. In that
+ // case do not clear allDrawn until the animation completes.
+ boolean deferClearAllDrawn;
+
+ // Is this window's surface needed? This is almost like hidden, except
+ // it will sometimes be true a little earlier: when the token has
+ // been shown, but is still waiting for its app transition to execute
+ // before making its windows shown.
+ boolean hiddenRequested;
+
+ // Last visibility state we reported to the app token.
+ boolean reportedVisible;
+
+ // Set to true when the token has been removed from the window mgr.
+ boolean removed;
+
+ boolean mDisablePreviewScreenshots;
+
+ // Information about an application starting window if displayed.
+ // Note: these are de-referenced before the starting window animates away.
+ StartingData mStartingData;
+ WindowState startingWindow;
+ WindowManagerPolicy.StartingSurface startingSurface;
+ boolean startingDisplayed;
+ boolean startingMoved;
+
+ // TODO: Have a WindowContainer state for tracking exiting/deferred removal.
+ boolean mIsExiting;
+
+ boolean mLaunchTaskBehind;
+ boolean mEnteringAnimation;
+
+ boolean mAppStopped;
+ // A hint to override the window specified rotation animation, or -1 to use the window specified
+ // value. We use this so that we can select the right animation in the cases of starting
+ // windows, where the app hasn't had time to set a value on the window.
+ int mRotationAnimationHint = -1;
+
+ ArrayDeque<Rect> mFrozenBounds = new ArrayDeque<>();
+ ArrayDeque<Configuration> mFrozenMergedConfig = new ArrayDeque<>();
+
+ /** Whether this token should be boosted at the top of all app window tokens. */
+ @VisibleForTesting boolean mNeedsZBoost;
+
+ /** Layer used to constrain the animation to a token's stack bounds. */
+ SurfaceControl mAnimationBoundsLayer;
+
+ /** Whether this token needs to create mAnimationBoundsLayer for cropping animations. */
+ boolean mNeedsAnimationBoundsLayer;
+
+ private AppSaturationInfo mLastAppSaturationInfo;
+
+ private final ColorDisplayService.ColorTransformController mColorTransformController =
+ (matrix, translation) -> mWmService.mH.post(() -> {
+ synchronized (mWmService.mGlobalLock) {
+ if (mLastAppSaturationInfo == null) {
+ mLastAppSaturationInfo = new AppSaturationInfo();
+ }
+
+ mLastAppSaturationInfo.setSaturation(matrix, translation);
+ updateColorTransform();
+ }
+ });
+
/**
* Current sequencing integer of the configuration, for skipping old activity configurations.
*/
@@ -412,6 +716,10 @@
private final Configuration mTmpConfig = new Configuration();
private final Rect mTmpBounds = new Rect();
+ private final Point mTmpPoint = new Point();
+ private final Rect mTmpRect = new Rect();
+ private final Rect mTmpPrevBounds = new Rect();
+
// Token for targeting this activity for assist purposes.
final Binder assistToken = new Binder();
@@ -429,6 +737,13 @@
}
void dump(PrintWriter pw, String prefix) {
+ }
+
+ /**
+ * Copied from old AppWindowToken.
+ */
+ @Override
+ void dump(PrintWriter pw, String prefix, boolean dumpAll) {
final long now = SystemClock.uptimeMillis();
pw.print(prefix); pw.print("packageName="); pw.print(packageName);
pw.print(" processName="); pw.println(processName);
@@ -576,6 +891,64 @@
pw.print("requestedVrComponent=");
pw.println(requestedVrComponent);
}
+ super.dump(pw, prefix, dumpAll);
+ if (appToken != null) {
+ pw.println(prefix + "app=true mVoiceInteraction=" + mVoiceInteraction);
+ }
+ pw.print(prefix); pw.print(" mOccludesParent="); pw.print(mOccludesParent);
+ pw.print(" mOrientation="); pw.println(mOrientation);
+ pw.println(prefix + "hiddenRequested=" + hiddenRequested + " mClientHidden=" + mClientHidden
+ + ((mDeferHidingClient) ? " mDeferHidingClient=" + mDeferHidingClient : "")
+ + " reportedDrawn=" + reportedDrawn + " reportedVisible=" + reportedVisible);
+ if (paused) {
+ pw.print(prefix); pw.print("paused="); pw.println(paused);
+ }
+ if (mAppStopped) {
+ pw.print(prefix); pw.print("mAppStopped="); pw.println(mAppStopped);
+ }
+ if (mNumInterestingWindows != 0 || mNumDrawnWindows != 0
+ || allDrawn || mLastAllDrawn) {
+ pw.print(prefix); pw.print("mNumInterestingWindows=");
+ pw.print(mNumInterestingWindows);
+ pw.print(" mNumDrawnWindows="); pw.print(mNumDrawnWindows);
+ pw.print(" inPendingTransaction="); pw.print(inPendingTransaction);
+ pw.print(" allDrawn="); pw.print(allDrawn);
+ pw.print(" lastAllDrawn="); pw.print(mLastAllDrawn);
+ pw.println(")");
+ }
+ if (inPendingTransaction) {
+ pw.print(prefix); pw.print("inPendingTransaction=");
+ pw.println(inPendingTransaction);
+ }
+ if (mStartingData != null || removed || firstWindowDrawn || mIsExiting) {
+ pw.print(prefix); pw.print("startingData="); pw.print(mStartingData);
+ pw.print(" removed="); pw.print(removed);
+ pw.print(" firstWindowDrawn="); pw.print(firstWindowDrawn);
+ pw.print(" mIsExiting="); pw.println(mIsExiting);
+ }
+ if (startingWindow != null || startingSurface != null
+ || startingDisplayed || startingMoved || mHiddenSetFromTransferredStartingWindow) {
+ pw.print(prefix); pw.print("startingWindow="); pw.print(startingWindow);
+ pw.print(" startingSurface="); pw.print(startingSurface);
+ pw.print(" startingDisplayed="); pw.print(startingDisplayed);
+ pw.print(" startingMoved="); pw.print(startingMoved);
+ pw.println(" mHiddenSetFromTransferredStartingWindow="
+ + mHiddenSetFromTransferredStartingWindow);
+ }
+ if (!mFrozenBounds.isEmpty()) {
+ pw.print(prefix); pw.print("mFrozenBounds="); pw.println(mFrozenBounds);
+ pw.print(prefix); pw.print("mFrozenMergedConfig="); pw.println(mFrozenMergedConfig);
+ }
+ if (mPendingRelaunchCount != 0) {
+ pw.print(prefix); pw.print("mPendingRelaunchCount="); pw.println(mPendingRelaunchCount);
+ }
+ if (mSizeCompatScale != 1f || mSizeCompatBounds != null) {
+ pw.println(prefix + "mSizeCompatScale=" + mSizeCompatScale + " mSizeCompatBounds="
+ + mSizeCompatBounds);
+ }
+ if (mRemovingFromDisplay) {
+ pw.println(prefix + "mRemovingFromDisplay=" + mRemovingFromDisplay);
+ }
if (lastVisibleTime != 0 || nowVisible) {
pw.print(prefix); pw.print(" nowVisible="); pw.print(nowVisible);
pw.print(" lastVisibleTime=");
@@ -587,7 +960,8 @@
pw.println(prefix + "mDeferHidingClient=" + mDeferHidingClient);
}
if (deferRelaunchUntilPaused || configChangeFlags != 0) {
- pw.print(prefix); pw.print("deferRelaunchUntilPaused="); pw.print(deferRelaunchUntilPaused);
+ pw.print(prefix); pw.print("deferRelaunchUntilPaused=");
+ pw.print(deferRelaunchUntilPaused);
pw.print(" configChangeFlags=");
pw.println(Integer.toHexString(configChangeFlags));
}
@@ -901,6 +1275,167 @@
this.task = task;
}
+ Task getTask() {
+ return (Task) getParent();
+ }
+
+ TaskStack getStack() {
+ final Task task = getTask();
+ if (task != null) {
+ return task.mStack;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ void onParentChanged() {
+ super.onParentChanged();
+
+ final Task task = getTask();
+
+ // When the associated task is {@code null}, the {@link ActivityRecord} can no longer
+ // access visual elements like the {@link DisplayContent}. We must remove any associations
+ // such as animations.
+ if (!mReparenting) {
+ if (task == null) {
+ // It is possible we have been marked as a closing app earlier. We must remove ourselves
+ // from this list so we do not participate in any future animations.
+ if (getDisplayContent() != null) {
+ getDisplayContent().mClosingApps.remove(this);
+ }
+ } else if (mLastParent != null && mLastParent.mStack != null) {
+ task.mStack.mExitingActivities.remove(this);
+ }
+ }
+ final TaskStack stack = getStack();
+
+ // If we reparent, make sure to remove ourselves from the old animation registry.
+ if (mAnimatingActivityRegistry != null) {
+ mAnimatingActivityRegistry.notifyFinished(this);
+ }
+ mAnimatingActivityRegistry = stack != null
+ ? stack.getAnimatingActivityRegistry()
+ : null;
+
+ mLastParent = task;
+
+ updateColorTransform();
+ }
+
+ private void updateColorTransform() {
+ if (mSurfaceControl != null && mLastAppSaturationInfo != null) {
+ getPendingTransaction().setColorTransform(mSurfaceControl,
+ mLastAppSaturationInfo.mMatrix, mLastAppSaturationInfo.mTranslation);
+ mWmService.scheduleAnimationLocked();
+ }
+ }
+
+ @Override
+ void onDisplayChanged(DisplayContent dc) {
+ DisplayContent prevDc = mDisplayContent;
+ super.onDisplayChanged(dc);
+ if (prevDc == null || prevDc == mDisplayContent) {
+ return;
+ }
+
+ if (prevDc.mOpeningApps.remove(this)) {
+ // Transfer opening transition to new display.
+ mDisplayContent.mOpeningApps.add(this);
+ mDisplayContent.prepareAppTransition(prevDc.mAppTransition.getAppTransition(), true);
+ mDisplayContent.executeAppTransition();
+ }
+
+ if (prevDc.mChangingApps.remove(this)) {
+ // This gets called *after* the ActivityRecord has been reparented to the new display.
+ // That reparenting resulted in this window changing modes (eg. FREEFORM -> FULLSCREEN),
+ // so this token is now "frozen" while waiting for the animation to start on prevDc
+ // (which will be cancelled since the window is no-longer a child). However, since this
+ // is no longer a child of prevDc, this won't be notified of the cancelled animation,
+ // so we need to cancel the change transition here.
+ clearChangeLeash(getPendingTransaction(), true /* cancel */);
+ }
+ prevDc.mClosingApps.remove(this);
+
+ if (prevDc.mFocusedApp == this) {
+ prevDc.setFocusedApp(null);
+ final TaskStack stack = dc.getTopStack();
+ if (stack != null) {
+ final Task task = stack.getTopChild();
+ if (task != null && task.getTopChild() == this) {
+ dc.setFocusedApp(this);
+ }
+ }
+ }
+
+ if (mLetterbox != null) {
+ mLetterbox.onMovedToDisplay(mDisplayContent.getDisplayId());
+ }
+ }
+
+ void layoutLetterbox(WindowState winHint) {
+ final WindowState w = findMainWindow();
+ if (w == null || winHint != null && w != winHint) {
+ return;
+ }
+ final boolean surfaceReady = w.isDrawnLw() // Regular case
+ || w.mWinAnimator.mSurfaceDestroyDeferred // The preserved surface is still ready.
+ || w.isDragResizeChanged(); // Waiting for relayoutWindow to call preserveSurface.
+ final boolean needsLetterbox = surfaceReady && w.isLetterboxedAppWindow() && fillsParent();
+ if (needsLetterbox) {
+ if (mLetterbox == null) {
+ mLetterbox = new Letterbox(() -> makeChildSurface(null),
+ mWmService.mTransactionFactory);
+ mLetterbox.attachInput(w);
+ }
+ getPosition(mTmpPoint);
+ // Get the bounds of the "space-to-fill". In multi-window mode, the task-level
+ // represents this. In fullscreen-mode, the stack does (since the orientation letterbox
+ // is also applied to the task).
+ Rect spaceToFill = (inMultiWindowMode() || getStack() == null)
+ ? getTask().getDisplayedBounds() : getStack().getDisplayedBounds();
+ mLetterbox.layout(spaceToFill, w.getFrameLw(), mTmpPoint);
+ } else if (mLetterbox != null) {
+ mLetterbox.hide();
+ }
+ }
+
+ void updateLetterboxSurface(WindowState winHint) {
+ final WindowState w = findMainWindow();
+ if (w != winHint && winHint != null && w != null) {
+ return;
+ }
+ layoutLetterbox(winHint);
+ if (mLetterbox != null && mLetterbox.needsApplySurfaceChanges()) {
+ mLetterbox.applySurfaceChanges(getPendingTransaction());
+ }
+ }
+
+ Rect getLetterboxInsets() {
+ if (mLetterbox != null) {
+ return mLetterbox.getInsets();
+ } else {
+ return new Rect();
+ }
+ }
+
+ /** Gets the inner bounds of letterbox. The bounds will be empty if there is no letterbox. */
+ void getLetterboxInnerBounds(Rect outBounds) {
+ if (mLetterbox != null) {
+ outBounds.set(mLetterbox.getInnerFrame());
+ } else {
+ outBounds.setEmpty();
+ }
+ }
+
+ /**
+ * @return {@code true} if there is a letterbox and any part of that letterbox overlaps with
+ * the given {@code rect}.
+ */
+ boolean isLetterboxOverlappingWith(Rect rect) {
+ return mLetterbox != null && mLetterbox.isOverlappingWith(rect);
+ }
+
static class Token extends IApplicationToken.Stub {
private WeakReference<ActivityRecord> weakActivity;
private final String name;
@@ -984,16 +1519,82 @@
ActivityRecord _resultTo, String _resultWho, int _reqCode, boolean _componentSpecified,
boolean _rootVoiceInteraction, ActivityStackSupervisor supervisor,
ActivityOptions options, ActivityRecord sourceRecord) {
- super(_service.mWindowManager, _service, new Token(_intent), aInfo, options, _intent,
- null /* displayContent */);
+ super(_service.mWindowManager, new Token(_intent).asBinder(), TYPE_APPLICATION, true,
+ null /* displayContent */, false /* ownerCanManageAppTokens */);
+
+ mAtmService = _service;
+ appToken = (Token) token;
+ info = aInfo;
+ mUserId = UserHandle.getUserId(info.applicationInfo.uid);
+ packageName = info.applicationInfo.packageName;
+ mInputApplicationHandle = new InputApplicationHandle(appToken);
+ intent = _intent;
+
+ // If the class name in the intent doesn't match that of the target, this is probably an
+ // alias. We have to create a new ComponentName object to keep track of the real activity
+ // name, so that FLAG_ACTIVITY_CLEAR_TOP is handled properly.
+ if (info.targetActivity == null
+ || (info.targetActivity.equals(intent.getComponent().getClassName())
+ && (info.launchMode == LAUNCH_MULTIPLE
+ || info.launchMode == LAUNCH_SINGLE_TOP))) {
+ mActivityComponent = intent.getComponent();
+ } else {
+ mActivityComponent =
+ new ComponentName(info.packageName, info.targetActivity);
+ }
+
+ mTargetSdk = info.applicationInfo.targetSdkVersion;
+ mShowForAllUsers = (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0;
+ setOrientation(info.screenOrientation);
+ mRotationAnimationHint = info.rotationAnimation;
+
+ mShowWhenLocked = (aInfo.flags & ActivityInfo.FLAG_SHOW_WHEN_LOCKED) != 0;
+ mInheritShownWhenLocked = (aInfo.privateFlags & FLAG_INHERIT_SHOW_WHEN_LOCKED) != 0;
+ mTurnScreenOn = (aInfo.flags & FLAG_TURN_SCREEN_ON) != 0;
+
+ int realTheme = info.getThemeResource();
+ if (realTheme == Resources.ID_NULL) {
+ realTheme = aInfo.applicationInfo.targetSdkVersion < HONEYCOMB
+ ? android.R.style.Theme : android.R.style.Theme_Holo;
+ }
+
+ final AttributeCache.Entry ent = AttributeCache.instance().get(packageName,
+ realTheme, com.android.internal.R.styleable.Window, mUserId);
+
+ if (ent != null) {
+ mOccludesParent = !ActivityInfo.isTranslucentOrFloating(ent.array);
+ hasWallpaper = ent.array.getBoolean(R.styleable.Window_windowShowWallpaper, false);
+ noDisplay = ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false);
+ } else {
+ hasWallpaper = false;
+ noDisplay = false;
+ }
+
+ if (options != null) {
+ mLaunchTaskBehind = options.getLaunchTaskBehind();
+
+ final int rotationAnimation = options.getRotationAnimationHint();
+ // Only override manifest supplied option if set.
+ if (rotationAnimation >= 0) {
+ mRotationAnimationHint = rotationAnimation;
+ }
+ }
+
+ // Application tokens start out hidden.
+ setHidden(true);
+ hiddenRequested = true;
+
+ ColorDisplayService.ColorDisplayServiceInternal cds = LocalServices.getService(
+ ColorDisplayService.ColorDisplayServiceInternal.class);
+ cds.attachColorTransformController(packageName, mUserId,
+ new WeakReference<>(mColorTransformController));
+
appToken.attach(this);
mRootActivityContainer = _service.mRootActivityContainer;
- info = aInfo;
launchedFromPid = _launchedFromPid;
launchedFromUid = _launchedFromUid;
launchedFromPackage = _launchedFromPackage;
- intent = _intent;
shortComponentName = _intent.getComponent().flattenToShortString();
resolvedType = _resolvedType;
componentSpecified = _componentSpecified;
@@ -1075,6 +1676,12 @@
}
}
+ @Override
+ ActivityRecord asActivityRecord() {
+ // I am an activity record!
+ return this;
+ }
+
void setProcess(WindowProcessController proc) {
app = proc;
final ActivityRecord root = task != null ? task.getRootActivity() : null;
@@ -1091,22 +1698,274 @@
return hasProcess() && app.hasThread();
}
+ void onAttachToTask(boolean voiceInteraction, DisplayContent dc,
+ long inputDispatchingTimeoutNanos) {
+ mInputDispatchingTimeoutNanos = inputDispatchingTimeoutNanos;
+ mVoiceInteraction = voiceInteraction;
+ onDisplayChanged(dc);
+
+ // Application tokens start out hidden.
+ setHidden(true);
+ hiddenRequested = true;
+ }
+
boolean addStartingWindow(String pkg, int theme, CompatibilityInfo compatInfo,
CharSequence nonLocalizedLabel, int labelRes, int icon, int logo, int windowFlags,
IBinder transferFrom, boolean newTask, boolean taskSwitch, boolean processRunning,
boolean allowTaskSnapshot, boolean activityCreated, boolean fromRecents) {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "setAppStartingWindow: token=%s"
- + " pkg=%s transferFrom=%s newTask=%b taskSwitch=%b processRunning=%b"
- + " allowTaskSnapshot=%b", appToken, pkg, transferFrom, newTask, taskSwitch,
- processRunning, allowTaskSnapshot);
- if (getParent() == null) {
- Slog.w(TAG_WM, "Attempted to start a window to an app token not having attached to any"
- + " task: " + appToken);
+ // If the display is frozen, we won't do anything until the actual window is
+ // displayed so there is no reason to put in the starting window.
+ if (!okToDisplay()) {
return false;
}
- return super.addStartingWindow(pkg, theme, compatInfo, nonLocalizedLabel,
- labelRes, icon, logo, windowFlags, transferFrom, newTask, taskSwitch,
- processRunning, allowTaskSnapshot, activityCreated, fromRecents);
+
+ if (mStartingData != null) {
+ return false;
+ }
+
+ final WindowState mainWin = findMainWindow();
+ if (mainWin != null && mainWin.mWinAnimator.getShown()) {
+ // App already has a visible window...why would you want a starting window?
+ return false;
+ }
+
+ final ActivityManager.TaskSnapshot snapshot =
+ mWmService.mTaskSnapshotController.getSnapshot(
+ getTask().mTaskId, getTask().mUserId,
+ false /* restoreFromDisk */, false /* reducedResolution */);
+ final int type = getStartingWindowType(newTask, taskSwitch, processRunning,
+ allowTaskSnapshot, activityCreated, fromRecents, snapshot);
+
+ if (type == STARTING_WINDOW_TYPE_SNAPSHOT) {
+ return createSnapshot(snapshot);
+ }
+
+ // If this is a translucent window, then don't show a starting window -- the current
+ // effect (a full-screen opaque starting window that fades away to the real contents
+ // when it is ready) does not work for this.
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Checking theme of starting window: 0x%x", theme);
+ if (theme != 0) {
+ AttributeCache.Entry ent = AttributeCache.instance().get(pkg, theme,
+ com.android.internal.R.styleable.Window,
+ mWmService.mCurrentUserId);
+ if (ent == null) {
+ // Whoops! App doesn't exist. Um. Okay. We'll just pretend like we didn't
+ // see that.
+ return false;
+ }
+ final boolean windowIsTranslucent = ent.array.getBoolean(
+ com.android.internal.R.styleable.Window_windowIsTranslucent, false);
+ final boolean windowIsFloating = ent.array.getBoolean(
+ com.android.internal.R.styleable.Window_windowIsFloating, false);
+ final boolean windowShowWallpaper = ent.array.getBoolean(
+ com.android.internal.R.styleable.Window_windowShowWallpaper, false);
+ final boolean windowDisableStarting = ent.array.getBoolean(
+ com.android.internal.R.styleable.Window_windowDisablePreview, false);
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Translucent=%s Floating=%s ShowWallpaper=%s",
+ windowIsTranslucent, windowIsFloating, windowShowWallpaper);
+ if (windowIsTranslucent) {
+ return false;
+ }
+ if (windowIsFloating || windowDisableStarting) {
+ return false;
+ }
+ if (windowShowWallpaper) {
+ if (getDisplayContent().mWallpaperController
+ .getWallpaperTarget() == null) {
+ // If this theme is requesting a wallpaper, and the wallpaper
+ // is not currently visible, then this effectively serves as
+ // an opaque window and our starting window transition animation
+ // can still work. We just need to make sure the starting window
+ // is also showing the wallpaper.
+ windowFlags |= FLAG_SHOW_WALLPAPER;
+ } else {
+ return false;
+ }
+ }
+ }
+
+ if (transferStartingWindow(transferFrom)) {
+ return true;
+ }
+
+ // There is no existing starting window, and we don't want to create a splash screen, so
+ // that's it!
+ if (type != STARTING_WINDOW_TYPE_SPLASH_SCREEN) {
+ return false;
+ }
+
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Creating SplashScreenStartingData");
+ mStartingData = new SplashScreenStartingData(mWmService, pkg,
+ theme, compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags,
+ getMergedOverrideConfiguration());
+ scheduleAddStartingWindow();
+ return true;
+ }
+
+ private boolean createSnapshot(ActivityManager.TaskSnapshot snapshot) {
+ if (snapshot == null) {
+ return false;
+ }
+
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Creating SnapshotStartingData");
+ mStartingData = new SnapshotStartingData(mWmService, snapshot);
+ scheduleAddStartingWindow();
+ return true;
+ }
+
+ void scheduleAddStartingWindow() {
+ // Note: we really want to do sendMessageAtFrontOfQueue() because we
+ // want to process the message ASAP, before any other queued
+ // messages.
+ if (!mWmService.mAnimationHandler.hasCallbacks(mAddStartingWindow)) {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Enqueueing ADD_STARTING");
+ mWmService.mAnimationHandler.postAtFrontOfQueue(mAddStartingWindow);
+ }
+ }
+
+ private class AddStartingWindow implements Runnable {
+
+ @Override
+ public void run() {
+ // Can be accessed without holding the global lock
+ final StartingData startingData;
+ synchronized (mWmService.mGlobalLock) {
+ // There can only be one adding request, silly caller!
+ mWmService.mAnimationHandler.removeCallbacks(this);
+
+ if (mStartingData == null) {
+ // Animation has been canceled... do nothing.
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
+ "startingData was nulled out before handling"
+ + " mAddStartingWindow: %s", ActivityRecord.this);
+ return;
+ }
+ startingData = mStartingData;
+ }
+
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Add starting %s: startingData=%s",
+ this, startingData);
+
+
+ WindowManagerPolicy.StartingSurface surface = null;
+ try {
+ surface = startingData.createStartingSurface(ActivityRecord.this);
+ } catch (Exception e) {
+ Slog.w(TAG, "Exception when adding starting window", e);
+ }
+ if (surface != null) {
+ boolean abort = false;
+ synchronized (mWmService.mGlobalLock) {
+ // If the window was successfully added, then
+ // we need to remove it.
+ if (removed || mStartingData == null) {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
+ "Aborted starting %s: removed=%b startingData=%s",
+ ActivityRecord.this, removed, mStartingData);
+
+ startingWindow = null;
+ mStartingData = null;
+ abort = true;
+ } else {
+ startingSurface = surface;
+ }
+ if (!abort) {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
+ "Added starting %s: startingWindow=%s startingView=%s",
+ ActivityRecord.this, startingWindow, startingSurface);
+ }
+ }
+ if (abort) {
+ surface.remove();
+ }
+ } else {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Surface returned was null: %s",
+ ActivityRecord.this);
+ }
+ }
+ }
+
+ private final AddStartingWindow mAddStartingWindow = new AddStartingWindow();
+
+ private int getStartingWindowType(boolean newTask, boolean taskSwitch, boolean processRunning,
+ boolean allowTaskSnapshot, boolean activityCreated, boolean fromRecents,
+ ActivityManager.TaskSnapshot snapshot) {
+ if (getDisplayContent().mAppTransition.getAppTransition()
+ == TRANSIT_DOCK_TASK_FROM_RECENTS) {
+ // TODO(b/34099271): Remove this statement to add back the starting window and figure
+ // out why it causes flickering, the starting window appears over the thumbnail while
+ // the docked from recents transition occurs
+ return STARTING_WINDOW_TYPE_NONE;
+ } else if (newTask || !processRunning || (taskSwitch && !activityCreated)) {
+ return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
+ } else if (taskSwitch && allowTaskSnapshot) {
+ if (mWmService.mLowRamTaskSnapshotsAndRecents) {
+ // For low RAM devices, we use the splash screen starting window instead of the
+ // task snapshot starting window.
+ return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
+ }
+ return snapshot == null ? STARTING_WINDOW_TYPE_NONE
+ : snapshotOrientationSameAsTask(snapshot) || fromRecents
+ ? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN;
+ } else {
+ return STARTING_WINDOW_TYPE_NONE;
+ }
+ }
+
+ private boolean snapshotOrientationSameAsTask(ActivityManager.TaskSnapshot snapshot) {
+ if (snapshot == null) {
+ return false;
+ }
+ return getTask().getConfiguration().orientation == snapshot.getOrientation();
+ }
+
+ void removeStartingWindow() {
+ if (startingWindow == null) {
+ if (mStartingData != null) {
+ // Starting window has not been added yet, but it is scheduled to be added.
+ // Go ahead and cancel the request.
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Clearing startingData for token=%s", this);
+ mStartingData = null;
+ }
+ return;
+ }
+
+ final WindowManagerPolicy.StartingSurface surface;
+ if (mStartingData != null) {
+ surface = startingSurface;
+ mStartingData = null;
+ startingSurface = null;
+ startingWindow = null;
+ startingDisplayed = false;
+ if (surface == null) {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
+ "startingWindow was set but startingSurface==null, couldn't "
+ + "remove");
+
+ return;
+ }
+ } else {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
+ "Tried to remove starting window but startingWindow was null: %s",
+ this);
+ return;
+ }
+
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Schedule remove starting %s startingWindow=%s"
+ + " startingView=%s Callers=%s",
+ this, startingWindow, startingSurface, Debug.getCallers(5));
+
+
+ // Use the same thread to remove the window as we used to add it, as otherwise we end up
+ // with things in the view hierarchy being called from different threads.
+ mWmService.mAnimationHandler.post(() -> {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Removing startingView=%s", surface);
+ try {
+ surface.remove();
+ } catch (Exception e) {
+ Slog.w(TAG_WM, "Exception when removing starting window", e);
+ }
+ });
}
void removeWindowContainer() {
@@ -1147,7 +2006,44 @@
+ " r=" + this + " (" + prevTask.getStackId() + ")");
}
- reparent(newTask.getTask(), position);
+ final Task task = newTask.getTask();
+ ProtoLog.i(WM_DEBUG_ADD_REMOVE, "reparent: moving app token=%s"
+ + " to task=%d at %d", this, task.mTaskId, position);
+
+ if (task == null) {
+ throw new IllegalArgumentException("reparent: could not find task");
+ }
+ final Task currentTask = getTask();
+ if (task == currentTask) {
+ throw new IllegalArgumentException(
+ "window token=" + this + " already child of task=" + currentTask);
+ }
+
+ if (currentTask.mStack != task.mStack) {
+ throw new IllegalArgumentException(
+ "window token=" + this + " current task=" + currentTask
+ + " belongs to a different stack than " + task);
+ }
+
+ ProtoLog.i(WM_DEBUG_ADD_REMOVE, "reParentWindowToken: removing window token=%s"
+ + " from task=%s" , this, currentTask);
+ final DisplayContent prevDisplayContent = getDisplayContent();
+
+ mReparenting = true;
+
+ getParent().removeChild(this);
+ task.addChild(this, position);
+
+ mReparenting = false;
+
+ // Relayout display(s).
+ final DisplayContent displayContent = task.getDisplayContent();
+ displayContent.setLayoutNeeded();
+ if (prevDisplayContent != displayContent) {
+ onDisplayChanged(displayContent);
+ prevDisplayContent.setLayoutNeeded();
+ }
+ getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
// Reparenting prevents informing the parent stack of activity removal in the case that
// the new stack has the same parent. we must manually signal here if this is not the case.
@@ -1252,8 +2148,22 @@
return stack != null ? stack.getDisplay() : null;
}
+ @Override
+ boolean fillsParent() {
+ return occludesParent();
+ }
+
+ /** Returns true if this activity is opaque and fills the entire space of this task. */
+ boolean occludesParent() {
+ return mOccludesParent;
+ }
+
boolean setOccludesParent(boolean occludesParent) {
- final boolean changed = super.setOccludesParent(occludesParent);
+ final boolean changed = occludesParent != mOccludesParent;
+ mOccludesParent = occludesParent;
+ setMainWindowOpaque(occludesParent);
+ mWmService.mWindowPlacerLocked.requestTraversal();
+
if (changed && task != null) {
if (!occludesParent) {
getActivityStack().convertActivityToTranslucent(this);
@@ -1270,6 +2180,15 @@
return changed;
}
+ void setMainWindowOpaque(boolean isOpaque) {
+ final WindowState win = findMainWindow();
+ if (win == null) {
+ return;
+ }
+ isOpaque = isOpaque & !PixelFormat.formatHasAlpha(win.getAttrs().format);
+ win.mWinAnimator.setOpaqueLocked(isOpaque);
+ }
+
void takeFromHistory() {
if (inHistory) {
inHistory = false;
@@ -1421,6 +2340,22 @@
}
/**
+ * Sets if this AWT is in the process of closing or entering PIP.
+ * {@link #mWillCloseOrEnterPip}}
+ */
+ void setWillCloseOrEnterPip(boolean willCloseOrEnterPip) {
+ mWillCloseOrEnterPip = willCloseOrEnterPip;
+ }
+
+ /**
+ * Returns whether this AWT is considered closing. Conditions are either
+ * 1. Is this app animating and was requested to be hidden
+ * 2. App is delayed closing since it might enter PIP.
+ */
+ boolean isClosingOrEnteringPip() {
+ return (isAnimating() && hiddenRequested) || mWillCloseOrEnterPip;
+ }
+ /**
* @return Whether AppOps allows this package to enter picture-in-picture.
*/
private boolean checkEnterPictureInPictureAppOpsState() {
@@ -1428,6 +2363,27 @@
OP_PICTURE_IN_PICTURE, info.applicationInfo.uid, packageName) == MODE_ALLOWED;
}
+ boolean isAlwaysFocusable() {
+ return (info.flags & FLAG_ALWAYS_FOCUSABLE) != 0;
+ }
+
+ // TODO: Does this really need to be different from isAlwaysFocusable()? For the activity side
+ // focusable means resumeable. I guess with that in mind maybe we should rename the other
+ // method to isResumeable() or something like that.
+ boolean windowsAreFocusable() {
+ if (mTargetSdk < Build.VERSION_CODES.Q) {
+ final int pid = getPid();
+ final ActivityRecord topFocusedAppOfMyProcess =
+ mWmService.mRoot.mTopFocusedAppByProcess.get(pid);
+ if (topFocusedAppOfMyProcess != null && topFocusedAppOfMyProcess != this) {
+ // For the apps below Q, there can be only one app which has the focused window per
+ // process, because legacy apps may not be ready for a multi-focus system.
+ return false;
+ }
+ }
+ return getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable();
+ }
+
/** Move activity with its stack to front and make the stack focused. */
boolean moveFocusableActivityToTop(String reason) {
if (!isFocusable()) {
@@ -2076,6 +3032,106 @@
clearRelaunching();
}
+ boolean isRelaunching() {
+ return mPendingRelaunchCount > 0;
+ }
+
+ boolean shouldFreezeBounds() {
+ final Task task = getTask();
+
+ // For freeform windows, we can't freeze the bounds at the moment because this would make
+ // the resizing unresponsive.
+ if (task == null || task.inFreeformWindowingMode()) {
+ return false;
+ }
+
+ // We freeze the bounds while drag resizing to deal with the time between
+ // the divider/drag handle being released, and the handling it's new
+ // configuration. If we are relaunched outside of the drag resizing state,
+ // we need to be careful not to do this.
+ return getTask().isDragResizing();
+ }
+
+ void startRelaunching() {
+ if (shouldFreezeBounds()) {
+ freezeBounds();
+ }
+
+ // In the process of tearing down before relaunching, the app will
+ // try and clean up it's child surfaces. We need to prevent this from
+ // happening, so we sever the children, transfering their ownership
+ // from the client it-self to the parent surface (owned by us).
+ detachChildren();
+
+ mPendingRelaunchCount++;
+ }
+
+ /**
+ * Freezes the task bounds. The size of this task reported the app will be fixed to the bounds
+ * freezed by {@link Task#prepareFreezingBounds} until {@link #unfreezeBounds} gets called, even
+ * if they change in the meantime. If the bounds are already frozen, the bounds will be frozen
+ * with a queue.
+ */
+ private void freezeBounds() {
+ final Task task = getTask();
+ mFrozenBounds.offer(new Rect(task.mPreparedFrozenBounds));
+
+ if (task.mPreparedFrozenMergedConfig.equals(Configuration.EMPTY)) {
+ // We didn't call prepareFreezingBounds on the task, so use the current value.
+ mFrozenMergedConfig.offer(new Configuration(task.getConfiguration()));
+ } else {
+ mFrozenMergedConfig.offer(new Configuration(task.mPreparedFrozenMergedConfig));
+ }
+ // Calling unset() to make it equal to Configuration.EMPTY.
+ task.mPreparedFrozenMergedConfig.unset();
+ }
+
+ void detachChildren() {
+ SurfaceControl.openTransaction();
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState w = mChildren.get(i);
+ w.mWinAnimator.detachChildren();
+ }
+ SurfaceControl.closeTransaction();
+ }
+
+ void finishRelaunching() {
+ unfreezeBounds();
+
+ if (mPendingRelaunchCount > 0) {
+ mPendingRelaunchCount--;
+ } else {
+ // Update keyguard flags upon finishing relaunch.
+ checkKeyguardFlagsChanged();
+ }
+ }
+
+ void clearRelaunching() {
+ if (mPendingRelaunchCount == 0) {
+ return;
+ }
+ unfreezeBounds();
+ mPendingRelaunchCount = 0;
+ }
+
+ /**
+ * Unfreezes the previously frozen bounds. See {@link #freezeBounds}.
+ */
+ private void unfreezeBounds() {
+ if (mFrozenBounds.isEmpty()) {
+ return;
+ }
+ mFrozenBounds.remove();
+ if (!mFrozenMergedConfig.isEmpty()) {
+ mFrozenMergedConfig.remove();
+ }
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState win = mChildren.get(i);
+ win.onUnfreezeBounds();
+ }
+ mWmService.mWindowPlacerLocked.performSurfacePlacement();
+ }
+
/**
* Perform clean-up of service connections in an activity record.
*/
@@ -2087,6 +3143,504 @@
mServiceConnectionsHolder.disconnectActivityFromServices();
}
+ @Override
+ void removeImmediately() {
+ onRemovedFromDisplay();
+ super.removeImmediately();
+ }
+
+ @Override
+ void removeIfPossible() {
+ mIsExiting = false;
+ removeAllWindowsIfPossible();
+ removeImmediately();
+ }
+
+ @Override
+ boolean checkCompleteDeferredRemoval() {
+ if (mIsExiting) {
+ removeIfPossible();
+ }
+ return super.checkCompleteDeferredRemoval();
+ }
+
+ void onRemovedFromDisplay() {
+ if (mRemovingFromDisplay) {
+ return;
+ }
+ mRemovingFromDisplay = true;
+
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Removing app token: %s", this);
+
+ boolean delayed = commitVisibility(null, false, TRANSIT_UNSET, true, mVoiceInteraction);
+
+ getDisplayContent().mOpeningApps.remove(this);
+ getDisplayContent().mChangingApps.remove(this);
+ getDisplayContent().mUnknownAppVisibilityController.appRemovedOrHidden(this);
+ mWmService.mTaskSnapshotController.onAppRemoved(this);
+ waitingToShow = false;
+ if (getDisplayContent().mClosingApps.contains(this)) {
+ delayed = true;
+ } else if (getDisplayContent().mAppTransition.isTransitionSet()) {
+ getDisplayContent().mClosingApps.add(this);
+ delayed = true;
+ }
+
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
+ "Removing app %s delayed=%b animation=%s animating=%b", this, delayed,
+ getAnimation(), isSelfAnimating());
+
+ ProtoLog.v(WM_DEBUG_ADD_REMOVE, "removeAppToken: %s"
+ + " delayed=%b Callers=%s", this, delayed, Debug.getCallers(4));
+
+ if (mStartingData != null) {
+ removeStartingWindow();
+ }
+
+ // If this window was animating, then we need to ensure that the app transition notifies
+ // that animations have completed in DisplayContent.handleAnimatingStoppedAndTransition(),
+ // so add to that list now
+ if (isSelfAnimating()) {
+ getDisplayContent().mNoAnimationNotifyOnTransitionFinished.add(token);
+ }
+
+ final TaskStack stack = getStack();
+ if (delayed && !isEmpty()) {
+ // set the token aside because it has an active animation to be finished
+ ProtoLog.v(WM_DEBUG_ADD_REMOVE,
+ "removeAppToken make exiting: %s", this);
+ if (stack != null) {
+ stack.mExitingActivities.add(this);
+ }
+ mIsExiting = true;
+ } else {
+ // Make sure there is no animation running on this token, so any windows associated
+ // with it will be removed as soon as their animations are complete
+ cancelAnimation();
+ if (stack != null) {
+ stack.mExitingActivities.remove(this);
+ }
+ removeIfPossible();
+ }
+
+ removed = true;
+ stopFreezingScreen(true, true);
+
+ final DisplayContent dc = getDisplayContent();
+ if (dc.mFocusedApp == this) {
+ ProtoLog.v(WM_DEBUG_FOCUS_LIGHT,
+ "Removing focused app token:%s displayId=%d", this,
+ dc.getDisplayId());
+ dc.setFocusedApp(null);
+ mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, true /*updateInputWindows*/);
+ }
+ if (mLetterbox != null) {
+ mLetterbox.destroy();
+ mLetterbox = null;
+ }
+
+ if (!delayed) {
+ updateReportedVisibilityLocked();
+ }
+
+ // Reset the last saved PiP snap fraction on removal.
+ mDisplayContent.mPinnedStackControllerLocked.resetReentrySnapFraction(mActivityComponent);
+
+ mRemovingFromDisplay = false;
+ }
+
+ /**
+ * Returns true if the new child window we are adding to this token is considered greater than
+ * the existing child window in this token in terms of z-order.
+ */
+ @Override
+ protected boolean isFirstChildWindowGreaterThanSecond(WindowState newWindow,
+ WindowState existingWindow) {
+ final int type1 = newWindow.mAttrs.type;
+ final int type2 = existingWindow.mAttrs.type;
+
+ // Base application windows should be z-ordered BELOW all other windows in the app token.
+ if (type1 == TYPE_BASE_APPLICATION && type2 != TYPE_BASE_APPLICATION) {
+ return false;
+ } else if (type1 != TYPE_BASE_APPLICATION && type2 == TYPE_BASE_APPLICATION) {
+ return true;
+ }
+
+ // Starting windows should be z-ordered ABOVE all other windows in the app token.
+ if (type1 == TYPE_APPLICATION_STARTING && type2 != TYPE_APPLICATION_STARTING) {
+ return true;
+ } else if (type1 != TYPE_APPLICATION_STARTING && type2 == TYPE_APPLICATION_STARTING) {
+ return false;
+ }
+
+ // Otherwise the new window is greater than the existing window.
+ return true;
+ }
+
+ /**
+ * @return {@code true} if starting window is in app's hierarchy.
+ */
+ boolean hasStartingWindow() {
+ if (startingDisplayed || mStartingData != null) {
+ return true;
+ }
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ if (getChildAt(i).mAttrs.type == TYPE_APPLICATION_STARTING) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ boolean isLastWindow(WindowState win) {
+ return mChildren.size() == 1 && mChildren.get(0) == win;
+ }
+
+ @Override
+ void addWindow(WindowState w) {
+ super.addWindow(w);
+
+ boolean gotReplacementWindow = false;
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState candidate = mChildren.get(i);
+ gotReplacementWindow |= candidate.setReplacementWindowIfNeeded(w);
+ }
+
+ // if we got a replacement window, reset the timeout to give drawing more time
+ if (gotReplacementWindow) {
+ mWmService.scheduleWindowReplacementTimeouts(this);
+ }
+ checkKeyguardFlagsChanged();
+ }
+
+ @Override
+ void removeChild(WindowState child) {
+ if (!mChildren.contains(child)) {
+ // This can be true when testing.
+ return;
+ }
+ super.removeChild(child);
+ checkKeyguardFlagsChanged();
+ updateLetterboxSurface(child);
+ }
+
+ private boolean waitingForReplacement() {
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState candidate = mChildren.get(i);
+ if (candidate.waitingForReplacement()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ void onWindowReplacementTimeout() {
+ for (int i = mChildren.size() - 1; i >= 0; --i) {
+ (mChildren.get(i)).onWindowReplacementTimeout();
+ }
+ }
+
+ void setAppLayoutChanges(int changes, String reason) {
+ if (!mChildren.isEmpty()) {
+ final DisplayContent dc = getDisplayContent();
+ dc.pendingLayoutChanges |= changes;
+ if (DEBUG_LAYOUT_REPEATS) {
+ mWmService.mWindowPlacerLocked.debugLayoutRepeats(reason, dc.pendingLayoutChanges);
+ }
+ }
+ }
+
+ void removeReplacedWindowIfNeeded(WindowState replacement) {
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState win = mChildren.get(i);
+ if (win.removeReplacedWindowIfNeeded(replacement)) {
+ return;
+ }
+ }
+ }
+
+ boolean transferStartingWindow(IBinder transferFrom) {
+ final ActivityRecord fromActivity = getDisplayContent().getActivityRecord(transferFrom);
+ if (fromActivity == null) {
+ return false;
+ }
+
+ final WindowState tStartingWindow = fromActivity.startingWindow;
+ if (tStartingWindow != null && fromActivity.startingSurface != null) {
+ // In this case, the starting icon has already been displayed, so start
+ // letting windows get shown immediately without any more transitions.
+ getDisplayContent().mSkipAppTransitionAnimation = true;
+
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Moving existing starting %s"
+ + " from %s to %s", tStartingWindow, fromActivity, this);
+
+ final long origId = Binder.clearCallingIdentity();
+ try {
+ // Transfer the starting window over to the new token.
+ mStartingData = fromActivity.mStartingData;
+ startingSurface = fromActivity.startingSurface;
+ startingDisplayed = fromActivity.startingDisplayed;
+ fromActivity.startingDisplayed = false;
+ startingWindow = tStartingWindow;
+ reportedVisible = fromActivity.reportedVisible;
+ fromActivity.mStartingData = null;
+ fromActivity.startingSurface = null;
+ fromActivity.startingWindow = null;
+ fromActivity.startingMoved = true;
+ tStartingWindow.mToken = this;
+ tStartingWindow.mActivityRecord = this;
+
+ ProtoLog.v(WM_DEBUG_ADD_REMOVE,
+ "Removing starting %s from %s", tStartingWindow, fromActivity);
+ fromActivity.removeChild(tStartingWindow);
+ fromActivity.postWindowRemoveStartingWindowCleanup(tStartingWindow);
+ fromActivity.mHiddenSetFromTransferredStartingWindow = false;
+ addWindow(tStartingWindow);
+
+ // Propagate other interesting state between the tokens. If the old token is displayed,
+ // we should immediately force the new one to be displayed. If it is animating, we need
+ // to move that animation to the new one.
+ if (fromActivity.allDrawn) {
+ allDrawn = true;
+ deferClearAllDrawn = fromActivity.deferClearAllDrawn;
+ }
+ if (fromActivity.firstWindowDrawn) {
+ firstWindowDrawn = true;
+ }
+ if (!fromActivity.isHidden()) {
+ setHidden(false);
+ hiddenRequested = false;
+ mHiddenSetFromTransferredStartingWindow = true;
+ }
+ setClientHidden(fromActivity.mClientHidden);
+
+ transferAnimation(fromActivity);
+
+ // When transferring an animation, we no longer need to apply an animation to the
+ // the token we transfer the animation over. Thus, set this flag to indicate we've
+ // transferred the animation.
+ mUseTransferredAnimation = true;
+
+ mWmService.updateFocusedWindowLocked(
+ UPDATE_FOCUS_WILL_PLACE_SURFACES, true /*updateInputWindows*/);
+ getDisplayContent().setLayoutNeeded();
+ mWmService.mWindowPlacerLocked.performSurfacePlacement();
+ } finally {
+ Binder.restoreCallingIdentity(origId);
+ }
+ return true;
+ } else if (fromActivity.mStartingData != null) {
+ // The previous app was getting ready to show a
+ // starting window, but hasn't yet done so. Steal it!
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
+ "Moving pending starting from %s to %s", fromActivity, this);
+ mStartingData = fromActivity.mStartingData;
+ fromActivity.mStartingData = null;
+ fromActivity.startingMoved = true;
+ scheduleAddStartingWindow();
+ return true;
+ }
+
+ // TODO: Transfer thumbnail
+
+ return false;
+ }
+
+ /**
+ * Tries to transfer the starting window from a token that's above ourselves in the task but
+ * not visible anymore. This is a common scenario apps use: Trampoline activity T start main
+ * activity M in the same task. Now, when reopening the task, T starts on top of M but then
+ * immediately finishes after, so we have to transfer T to M.
+ */
+ void transferStartingWindowFromHiddenAboveTokenIfNeeded() {
+ final Task task = getTask();
+ for (int i = task.mChildren.size() - 1; i >= 0; i--) {
+ final ActivityRecord fromActivity = task.mChildren.get(i);
+ if (fromActivity == this) {
+ return;
+ }
+ if (fromActivity.hiddenRequested && transferStartingWindow(fromActivity.token)) {
+ return;
+ }
+ }
+ }
+
+ void checkKeyguardFlagsChanged() {
+ final boolean containsDismissKeyguard = containsDismissKeyguardWindow();
+ final boolean containsShowWhenLocked = containsShowWhenLockedWindow();
+ if (containsDismissKeyguard != mLastContainsDismissKeyguardWindow
+ || containsShowWhenLocked != mLastContainsShowWhenLockedWindow) {
+ mWmService.notifyKeyguardFlagsChanged(null /* callback */,
+ getDisplayContent().getDisplayId());
+ }
+ mLastContainsDismissKeyguardWindow = containsDismissKeyguard;
+ mLastContainsShowWhenLockedWindow = containsShowWhenLocked;
+ }
+
+ boolean containsDismissKeyguardWindow() {
+ // Window state is transient during relaunch. We are not guaranteed to be frozen during the
+ // entirety of the relaunch.
+ if (isRelaunching()) {
+ return mLastContainsDismissKeyguardWindow;
+ }
+
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ if ((mChildren.get(i).mAttrs.flags & FLAG_DISMISS_KEYGUARD) != 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ boolean containsShowWhenLockedWindow() {
+ // When we are relaunching, it is possible for us to be unfrozen before our previous
+ // windows have been added back. Using the cached value ensures that our previous
+ // showWhenLocked preference is honored until relaunching is complete.
+ if (isRelaunching()) {
+ return mLastContainsShowWhenLockedWindow;
+ }
+
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ if ((mChildren.get(i).mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ void setShowWhenLocked(boolean showWhenLocked) {
+ mShowWhenLocked = showWhenLocked;
+ mAtmService.mRootActivityContainer.ensureActivitiesVisible(null /* starting */,
+ 0 /* configChanges */, false /* preserveWindows */);
+ }
+
+ void setInheritShowWhenLocked(boolean inheritShowWhenLocked) {
+ mInheritShownWhenLocked = inheritShowWhenLocked;
+ mAtmService.mRootActivityContainer.ensureActivitiesVisible(null /* starting */,
+ 0 /* configChanges */, false /* preserveWindows */);
+ }
+
+ /**
+ * @return {@code true} if the activity windowing mode is not
+ * {@link android.app.WindowConfiguration#WINDOWING_MODE_PINNED} and a) activity
+ * contains windows that have {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED} set or if the
+ * activity has set {@link #mShowWhenLocked}, or b) if the activity has set
+ * {@link #mInheritShownWhenLocked} and the activity behind this satisfies the
+ * conditions a) above.
+ * Multi-windowing mode will be exited if {@code true} is returned.
+ */
+ boolean canShowWhenLocked() {
+ if (!inPinnedWindowingMode() && (mShowWhenLocked || containsShowWhenLockedWindow())) {
+ return true;
+ } else if (mInheritShownWhenLocked) {
+ final ActivityRecord r = getActivityBelow();
+ return r != null && !r.inPinnedWindowingMode() && (r.mShowWhenLocked
+ || r.containsShowWhenLockedWindow());
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @return Whether we are allowed to show non-starting windows at the moment. We disallow
+ * showing windows during transitions in case we have windows that have wide-color-gamut
+ * color mode set to avoid jank in the middle of the transition.
+ */
+ boolean canShowWindows() {
+ return allDrawn && !(isReallyAnimating() && hasNonDefaultColorWindow());
+ }
+
+ /**
+ * @return true if we have a window that has a non-default color mode set; false otherwise.
+ */
+ private boolean hasNonDefaultColorWindow() {
+ return forAllWindows(ws -> ws.mAttrs.getColorMode() != COLOR_MODE_DEFAULT,
+ true /* topToBottom */);
+ }
+
+ /**
+ * @return an {@link ActivityRecord} of the activity below this activity, or {@code null} if no
+ * such activity exists.
+ */
+ @Nullable
+ private ActivityRecord getActivityBelow() {
+ final Task task = getTask();
+ final int pos = task.mChildren.indexOf(this);
+ if (pos == -1) {
+ throw new IllegalStateException("Activity not found in its task");
+ }
+ return pos == 0 ? null : task.getChildAt(pos - 1);
+ }
+
+ WindowState getImeTargetBelowWindow(WindowState w) {
+ final int index = mChildren.indexOf(w);
+ if (index > 0) {
+ final WindowState target = mChildren.get(index - 1);
+ if (target.canBeImeTarget()) {
+ return target;
+ }
+ }
+ return null;
+ }
+
+ WindowState getHighestAnimLayerWindow(WindowState currentTarget) {
+ WindowState candidate = null;
+ for (int i = mChildren.indexOf(currentTarget); i >= 0; i--) {
+ final WindowState w = mChildren.get(i);
+ if (w.mRemoved) {
+ continue;
+ }
+ if (candidate == null) {
+ candidate = w;
+ }
+ }
+ return candidate;
+ }
+
+ @Override
+ boolean forAllWindows(ToBooleanFunction<WindowState> callback, boolean traverseTopToBottom) {
+ // For legacy reasons we process the TaskStack.mExitingActivities first in DisplayContent
+ // before the non-exiting app tokens. So, we skip the exiting app tokens here.
+ // TODO: Investigate if we need to continue to do this or if we can just process them
+ // in-order.
+ if (mIsExiting && !waitingForReplacement()) {
+ return false;
+ }
+ return forAllWindowsUnchecked(callback, traverseTopToBottom);
+ }
+
+ @Override
+ void forAllActivities(Consumer<ActivityRecord> callback) {
+ callback.accept(this);
+ }
+
+ boolean forAllWindowsUnchecked(ToBooleanFunction<WindowState> callback,
+ boolean traverseTopToBottom) {
+ return super.forAllWindows(callback, traverseTopToBottom);
+ }
+
+ @Override
+ protected void setLayer(Transaction t, int layer) {
+ if (!mSurfaceAnimator.hasLeash()) {
+ t.setLayer(mSurfaceControl, layer);
+ }
+ }
+
+ @Override
+ protected void setRelativeLayer(Transaction t, SurfaceControl relativeTo, int layer) {
+ if (!mSurfaceAnimator.hasLeash()) {
+ t.setRelativeLayer(mSurfaceControl, relativeTo, layer);
+ }
+ }
+
+ @Override
+ protected void reparentSurfaceControl(Transaction t, SurfaceControl newParent) {
+ if (!mSurfaceAnimator.hasLeash()) {
+ t.reparent(mSurfaceControl, newParent);
+ }
+ }
+
void logStartActivity(int tag, TaskRecord task) {
final Uri data = intent.getData();
final String strData = data != null ? data.toSafeString() : null;
@@ -2331,6 +3885,65 @@
}
}
+ void clearAllDrawn() {
+ allDrawn = false;
+ deferClearAllDrawn = false;
+ }
+
+ /**
+ * Returns whether the drawn window states of this {@link ActivityRecord} has considered every
+ * child {@link WindowState}. A child is considered if it has been passed into
+ * {@link #updateDrawnWindowStates(WindowState)} after being added. This is used to determine
+ * whether states, such as {@code allDrawn}, can be set, which relies on state variables such as
+ * {@code mNumInterestingWindows}, which depend on all {@link WindowState}s being considered.
+ *
+ * @return {@code true} If all children have been considered, {@code false}.
+ */
+ private boolean allDrawnStatesConsidered() {
+ for (int i = mChildren.size() - 1; i >= 0; --i) {
+ final WindowState child = mChildren.get(i);
+ if (child.mightAffectAllDrawn() && !child.getDrawnStateEvaluated()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Determines if the token has finished drawing. This should only be called from
+ * {@link DisplayContent#applySurfaceChangesTransaction}
+ */
+ void updateAllDrawn() {
+ if (!allDrawn) {
+ // Number of drawn windows can be less when a window is being relaunched, wait for
+ // all windows to be launched and drawn for this token be considered all drawn.
+ final int numInteresting = mNumInterestingWindows;
+
+ // We must make sure that all present children have been considered (determined by
+ // {@link #allDrawnStatesConsidered}) before evaluating whether everything has been
+ // drawn.
+ if (numInteresting > 0 && allDrawnStatesConsidered()
+ && mNumDrawnWindows >= numInteresting && !isRelaunching()) {
+ if (DEBUG_VISIBILITY) Slog.v(TAG, "allDrawn: " + this
+ + " interesting=" + numInteresting + " drawn=" + mNumDrawnWindows);
+ allDrawn = true;
+ // Force an additional layout pass where
+ // WindowStateAnimator#commitFinishDrawingLocked() will call performShowLocked().
+ if (mDisplayContent != null) {
+ mDisplayContent.setLayoutNeeded();
+ }
+ mWmService.mH.obtainMessage(H.NOTIFY_ACTIVITY_DRAWN, token).sendToTarget();
+
+ // Notify the pinned stack upon all windows drawn. If there was an animation in
+ // progress then this signal will resume that animation.
+ final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
+ if (pinnedStack != null) {
+ pinnedStack.onAllWindowsDrawn();
+ }
+ }
+ }
+ }
+
ActivityOptions getOptionsForTargetActivityLocked() {
return pendingOptions != null ? pendingOptions.forTargetActivity() : null;
}
@@ -2405,6 +4018,13 @@
}
}
+ @Override
+ boolean isVisible() {
+ // If the activity isn't hidden then it is considered visible and there is no need to check
+ // its children windows to see if they are visible.
+ return !isHidden();
+ }
+
void setVisibility(boolean visible) {
if (getParent() == null) {
Slog.w(TAG_WM, "Attempted to set visibility of non-existing app token: "
@@ -2425,6 +4045,336 @@
mStackSupervisor.mAppVisibilitiesChangedSinceLastPause = true;
}
+ void setVisibility(boolean visible, boolean deferHidingClient) {
+ final AppTransition appTransition = getDisplayContent().mAppTransition;
+
+ // Don't set visibility to false if we were already not visible. This prevents WM from
+ // adding the app to the closing app list which doesn't make sense for something that is
+ // already not visible. However, set visibility to true even if we are already visible.
+ // This makes sure the app is added to the opening apps list so that the right
+ // transition can be selected.
+ // TODO: Probably a good idea to separate the concept of opening/closing apps from the
+ // concept of setting visibility...
+ if (!visible && hiddenRequested) {
+
+ if (!deferHidingClient && mLastDeferHidingClient) {
+ // We previously deferred telling the client to hide itself when visibility was
+ // initially set to false. Now we would like it to hide, so go ahead and set it.
+ mLastDeferHidingClient = deferHidingClient;
+ setClientHidden(true);
+ }
+ return;
+ }
+
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
+ "setAppVisibility(%s, visible=%b): %s hidden=%b hiddenRequested=%b Callers=%s",
+ appToken, visible, appTransition, isHidden(), hiddenRequested,
+ Debug.getCallers(6));
+
+ final DisplayContent displayContent = getDisplayContent();
+ displayContent.mOpeningApps.remove(this);
+ displayContent.mClosingApps.remove(this);
+ if (isInChangeTransition()) {
+ clearChangeLeash(getPendingTransaction(), true /* cancel */);
+ }
+ displayContent.mChangingApps.remove(this);
+ waitingToShow = false;
+ hiddenRequested = !visible;
+ mLastDeferHidingClient = deferHidingClient;
+
+ if (!visible) {
+ // If the app is dead while it was visible, we kept its dead window on screen.
+ // Now that the app is going invisible, we can remove it. It will be restarted
+ // if made visible again.
+ removeDeadWindows();
+ } else {
+ if (!appTransition.isTransitionSet()
+ && appTransition.isReady()) {
+ // Add the app mOpeningApps if transition is unset but ready. This means
+ // we're doing a screen freeze, and the unfreeze will wait for all opening
+ // apps to be ready.
+ displayContent.mOpeningApps.add(this);
+ }
+ startingMoved = false;
+ // If the token is currently hidden (should be the common case), or has been
+ // stopped, then we need to set up to wait for its windows to be ready.
+ if (isHidden() || mAppStopped) {
+ clearAllDrawn();
+
+ // If the app was already visible, don't reset the waitingToShow state.
+ if (isHidden()) {
+ waitingToShow = true;
+
+ // If the client isn't hidden, we don't need to reset the drawing state.
+ if (isClientHidden()) {
+ // Let's reset the draw state in order to prevent the starting window to be
+ // immediately dismissed when the app still has the surface.
+ forAllWindows(w -> {
+ if (w.mWinAnimator.mDrawState == HAS_DRAWN) {
+ w.mWinAnimator.resetDrawState();
+
+ // Force add to mResizingWindows, so that we are guaranteed to get
+ // another reportDrawn callback.
+ w.resetLastContentInsets();
+ }
+ }, true /* traverseTopToBottom */);
+ }
+ }
+ }
+
+ // In the case where we are making an app visible but holding off for a transition,
+ // we still need to tell the client to make its windows visible so they get drawn.
+ // Otherwise, we will wait on performing the transition until all windows have been
+ // drawn, they never will be, and we are sad.
+ setClientHidden(false);
+
+ requestUpdateWallpaperIfNeeded();
+
+ ProtoLog.v(WM_DEBUG_ADD_REMOVE, "No longer Stopped: %s", this);
+ mAppStopped = false;
+
+ transferStartingWindowFromHiddenAboveTokenIfNeeded();
+ }
+
+ // If we are preparing an app transition, then delay changing
+ // the visibility of this token until we execute that transition.
+ if (okToAnimate() && appTransition.isTransitionSet()) {
+ inPendingTransaction = true;
+ if (visible) {
+ displayContent.mOpeningApps.add(this);
+ mEnteringAnimation = true;
+ } else {
+ displayContent.mClosingApps.add(this);
+ mEnteringAnimation = false;
+ }
+ if (appTransition.getAppTransition() == TRANSIT_TASK_OPEN_BEHIND) {
+ // We're launchingBehind, add the launching activity to mOpeningApps.
+ final WindowState win = getDisplayContent().findFocusedWindow();
+ if (win != null) {
+ final ActivityRecord focusedActivity = win.mActivityRecord;
+ if (focusedActivity != null) {
+ ProtoLog.d(WM_DEBUG_APP_TRANSITIONS,
+ "TRANSIT_TASK_OPEN_BEHIND, adding %s to mOpeningApps",
+ focusedActivity);
+
+ // Force animation to be loaded.
+ displayContent.mOpeningApps.add(focusedActivity);
+ }
+ }
+ }
+ return;
+ }
+
+ commitVisibility(null, visible, TRANSIT_UNSET, true, mVoiceInteraction);
+ updateReportedVisibilityLocked();
+ }
+
+ boolean commitVisibility(WindowManager.LayoutParams lp,
+ boolean visible, int transit, boolean performLayout, boolean isVoiceInteraction) {
+
+ boolean delayed = false;
+ inPendingTransaction = false;
+ // Reset the state of mHiddenSetFromTransferredStartingWindow since visibility is actually
+ // been set by the app now.
+ mHiddenSetFromTransferredStartingWindow = false;
+
+ // Allow for state changes and animation to be applied if:
+ // * token is transitioning visibility state
+ // * or the token was marked as hidden and is exiting before we had a chance to play the
+ // transition animation
+ // * or this is an opening app and windows are being replaced
+ // * or the token is the opening app and visible while opening task behind existing one.
+ final DisplayContent displayContent = getDisplayContent();
+ boolean visibilityChanged = false;
+ if (isHidden() == visible || (isHidden() && mIsExiting)
+ || (visible && waitingForReplacement())
+ || (visible && displayContent.mOpeningApps.contains(this)
+ && displayContent.mAppTransition.getAppTransition() == TRANSIT_TASK_OPEN_BEHIND)) {
+ final AccessibilityController accessibilityController =
+ mWmService.mAccessibilityController;
+ boolean changed = false;
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
+ "Changing app %s hidden=%b performLayout=%b", this, isHidden(),
+ performLayout);
+
+ boolean runningAppAnimation = false;
+
+ if (transit != WindowManager.TRANSIT_UNSET) {
+ if (mUseTransferredAnimation) {
+ runningAppAnimation = isReallyAnimating();
+ } else if (applyAnimationLocked(lp, transit, visible, isVoiceInteraction)) {
+ runningAppAnimation = true;
+ }
+ delayed = runningAppAnimation;
+ final WindowState window = findMainWindow();
+ if (window != null && accessibilityController != null) {
+ accessibilityController.onAppWindowTransitionLocked(window, transit);
+ }
+ changed = true;
+ }
+
+ final int windowsCount = mChildren.size();
+ for (int i = 0; i < windowsCount; i++) {
+ final WindowState win = mChildren.get(i);
+ changed |= win.onAppVisibilityChanged(visible, runningAppAnimation);
+ }
+
+ setHidden(!visible);
+ hiddenRequested = !visible;
+ visibilityChanged = true;
+ if (!visible) {
+ stopFreezingScreen(true, true);
+ } else {
+ // If we are being set visible, and the starting window is not yet displayed,
+ // then make sure it doesn't get displayed.
+ if (startingWindow != null && !startingWindow.isDrawnLw()) {
+ startingWindow.clearPolicyVisibilityFlag(LEGACY_POLICY_VISIBILITY);
+ startingWindow.mLegacyPolicyVisibilityAfterAnim = false;
+ }
+
+ // We are becoming visible, so better freeze the screen with the windows that are
+ // getting visible so we also wait for them.
+ forAllWindows(mWmService::makeWindowFreezingScreenIfNeededLocked, true);
+ }
+
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
+ "commitVisibility: %s: hidden=%b hiddenRequested=%b", this,
+ isHidden(), hiddenRequested);
+
+ if (changed) {
+ displayContent.getInputMonitor().setUpdateInputWindowsNeededLw();
+ if (performLayout) {
+ mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_WILL_PLACE_SURFACES,
+ false /*updateInputWindows*/);
+ mWmService.mWindowPlacerLocked.performSurfacePlacement();
+ }
+ displayContent.getInputMonitor().updateInputWindowsLw(false /*force*/);
+ }
+ }
+ mUseTransferredAnimation = false;
+
+ if (isReallyAnimating()) {
+ delayed = true;
+ } else {
+ // We aren't animating anything, but exiting windows rely on the animation finished
+ // callback being called in case the ActivityRecord was pretending to be animating,
+ // which we might have done because we were in closing/opening apps list.
+ onAnimationFinished();
+ }
+
+ for (int i = mChildren.size() - 1; i >= 0 && !delayed; i--) {
+ if ((mChildren.get(i)).isSelfOrChildAnimating()) {
+ delayed = true;
+ }
+ }
+
+ if (visibilityChanged) {
+ if (visible && !delayed) {
+ // The token was made immediately visible, there will be no entrance animation.
+ // We need to inform the client the enter animation was finished.
+ mEnteringAnimation = true;
+ mWmService.mActivityManagerAppTransitionNotifier.onAppTransitionFinishedLocked(
+ token);
+ }
+
+ // If we're becoming visible, immediately change client visibility as well. there seem
+ // to be some edge cases where we change our visibility but client visibility never gets
+ // updated.
+ // If we're becoming invisible, update the client visibility if we are not running an
+ // animation. Otherwise, we'll update client visibility in onAnimationFinished.
+ if (visible || !isReallyAnimating()) {
+ setClientHidden(!visible);
+ }
+
+ if (!displayContent.mClosingApps.contains(this)
+ && !displayContent.mOpeningApps.contains(this)) {
+ // The token is not closing nor opening, so even if there is an animation set, that
+ // doesn't mean that it goes through the normal app transition cycle so we have
+ // to inform the docked controller about visibility change.
+ // TODO(multi-display): notify docked divider on all displays where visibility was
+ // affected.
+ displayContent.getDockedDividerController().notifyAppVisibilityChanged();
+
+ // Take the screenshot before possibly hiding the WSA, otherwise the screenshot
+ // will not be taken.
+ mWmService.mTaskSnapshotController.notifyAppVisibilityChanged(this, visible);
+ }
+
+ // If we are hidden but there is no delay needed we immediately
+ // apply the Surface transaction so that the ActivityManager
+ // can have some guarantee on the Surface state following
+ // setting the visibility. This captures cases like dismissing
+ // the docked or pinned stack where there is no app transition.
+ //
+ // In the case of a "Null" animation, there will be
+ // no animation but there will still be a transition set.
+ // We still need to delay hiding the surface such that it
+ // can be synchronized with showing the next surface in the transition.
+ if (isHidden() && !delayed && !displayContent.mAppTransition.isTransitionSet()) {
+ SurfaceControl.openTransaction();
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ mChildren.get(i).mWinAnimator.hide("immediately hidden");
+ }
+ SurfaceControl.closeTransaction();
+ }
+ }
+
+ return delayed;
+ }
+
+ @Override
+ void setHidden(boolean hidden) {
+ super.setHidden(hidden);
+ scheduleAnimation();
+ }
+
+ @Override
+ void onAppTransitionDone() {
+ sendingToBottom = false;
+ }
+
+ /**
+ * See {@link Activity#setDisablePreviewScreenshots}.
+ */
+ void setDisablePreviewScreenshots(boolean disable) {
+ mDisablePreviewScreenshots = disable;
+ }
+
+ /**
+ * Retrieves whether we'd like to generate a snapshot that's based solely on the theme. This is
+ * the case when preview screenshots are disabled {@link #setDisablePreviewScreenshots} or when
+ * we can't take a snapshot for other reasons, for example, if we have a secure window.
+ *
+ * @return True if we need to generate an app theme snapshot, false if we'd like to take a real
+ * screenshot.
+ */
+ boolean shouldUseAppThemeSnapshot() {
+ return mDisablePreviewScreenshots || forAllWindows(w -> (w.mAttrs.flags & FLAG_SECURE) != 0,
+ true /* topToBottom */);
+ }
+
+ /**
+ * Sets whether the current launch can turn the screen on.
+ * @see #currentLaunchCanTurnScreenOn()
+ */
+ void setCurrentLaunchCanTurnScreenOn(boolean currentLaunchCanTurnScreenOn) {
+ mCurrentLaunchCanTurnScreenOn = currentLaunchCanTurnScreenOn;
+ }
+
+ /**
+ * Indicates whether the current launch can turn the screen on. This is to prevent multiple
+ * relayouts from turning the screen back on. The screen should only turn on at most
+ * once per activity resume.
+ * <p>
+ * Note this flag is only meaningful when {@link WindowManager.LayoutParams#FLAG_TURN_SCREEN_ON}
+ * or {@link ActivityRecord#canTurnScreenOn} is set.
+ *
+ * @return {@code true} if the activity is ready to turn on the screen.
+ */
+ boolean currentLaunchCanTurnScreenOn() {
+ return mCurrentLaunchCanTurnScreenOn;
+ }
+
void setState(ActivityState state, String reason) {
if (DEBUG_STATES) Slog.v(TAG_STATES, "State movement: " + this + " from:" + getState()
+ " to:" + state + " reason:" + reason);
@@ -2510,13 +4460,63 @@
|| state5 == mState;
}
+ void destroySurfaces() {
+ destroySurfaces(false /*cleanupOnResume*/);
+ }
+
+ /**
+ * Destroy surfaces which have been marked as eligible by the animator, taking care to ensure
+ * the client has finished with them.
+ *
+ * @param cleanupOnResume whether this is done when app is resumed without fully stopped. If
+ * set to true, destroy only surfaces of removed windows, and clear relevant flags of the
+ * others so that they are ready to be reused. If set to false (common case), destroy all
+ * surfaces that's eligible, if the app is already stopped.
+ */
+ private void destroySurfaces(boolean cleanupOnResume) {
+ boolean destroyedSomething = false;
+
+ // Copying to a different list as multiple children can be removed.
+ final ArrayList<WindowState> children = new ArrayList<>(mChildren);
+ for (int i = children.size() - 1; i >= 0; i--) {
+ final WindowState win = children.get(i);
+ destroyedSomething |= win.destroySurface(cleanupOnResume, mAppStopped);
+ }
+ if (destroyedSomething) {
+ final DisplayContent dc = getDisplayContent();
+ dc.assignWindowLayers(true /*setLayoutNeeded*/);
+ updateLetterboxSurface(null);
+ }
+ }
+
void notifyAppResumed(boolean wasStopped) {
if (getParent() == null) {
Slog.w(TAG_WM, "Attempted to notify resumed of non-existing app token: "
+ appToken);
return;
}
- super.notifyAppResumed(wasStopped);
+ ProtoLog.v(WM_DEBUG_ADD_REMOVE, "notifyAppResumed: wasStopped=%b %s",
+ wasStopped, this);
+ mAppStopped = false;
+ // Allow the window to turn the screen on once the app is resumed again.
+ setCurrentLaunchCanTurnScreenOn(true);
+ if (!wasStopped) {
+ destroySurfaces(true /*cleanupOnResume*/);
+ }
+ }
+
+ /**
+ * Notify that the app has stopped, and it is okay to destroy any surfaces which were
+ * keeping alive in case they were still being used.
+ */
+ void notifyAppStopped() {
+ ProtoLog.v(WM_DEBUG_ADD_REMOVE, "notifyAppStopped: %s", this);
+ mAppStopped = true;
+ // Reset the last saved PiP snap fraction on app stop.
+ mDisplayContent.mPinnedStackControllerLocked.resetReentrySnapFraction(mActivityComponent);
+ destroySurfaces();
+ // Remove any starting window that was added for this app if they are still around.
+ removeStartingWindow();
}
void notifyUnknownVisibilityLaunched() {
@@ -3087,6 +5087,40 @@
}
}
+ void startFreezingScreen() {
+ ProtoLog.i(WM_DEBUG_ORIENTATION,
+ "Set freezing of %s: hidden=%b freezing=%b hiddenRequested=%b. %s",
+ appToken, isHidden(), mFreezingScreen, hiddenRequested,
+ new RuntimeException().fillInStackTrace());
+ if (!hiddenRequested) {
+ if (!mFreezingScreen) {
+ mFreezingScreen = true;
+ mWmService.registerAppFreezeListener(this);
+ mWmService.mAppsFreezingScreen++;
+ if (mWmService.mAppsFreezingScreen == 1) {
+ mWmService.startFreezingDisplayLocked(0, 0, getDisplayContent());
+ mWmService.mH.removeMessages(H.APP_FREEZE_TIMEOUT);
+ mWmService.mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 2000);
+ }
+ }
+ final int count = mChildren.size();
+ for (int i = 0; i < count; i++) {
+ final WindowState w = mChildren.get(i);
+ w.onStartFreezingScreen();
+ }
+ }
+ }
+
+ boolean isFreezingScreen() {
+ return mFreezingScreen;
+ }
+
+ @Override
+ public void onAppFreezeTimeout() {
+ Slog.w(TAG_WM, "Force clearing freeze: " + this);
+ stopFreezingScreen(true, true);
+ }
+
void stopFreezingScreenLocked(boolean force) {
if (force || frozenBeforeDestroy) {
frozenBeforeDestroy = false;
@@ -3100,6 +5134,33 @@
}
}
+ void stopFreezingScreen(boolean unfreezeSurfaceNow, boolean force) {
+ if (!mFreezingScreen) {
+ return;
+ }
+ ProtoLog.v(WM_DEBUG_ORIENTATION,
+ "Clear freezing of %s force=%b", this, force);
+ final int count = mChildren.size();
+ boolean unfrozeWindows = false;
+ for (int i = 0; i < count; i++) {
+ final WindowState w = mChildren.get(i);
+ unfrozeWindows |= w.onStopFreezingScreen();
+ }
+ if (force || unfrozeWindows) {
+ ProtoLog.v(WM_DEBUG_ORIENTATION, "No longer freezing: %s", this);
+ mFreezingScreen = false;
+ mWmService.unregisterAppFreezeListener(this);
+ mWmService.mAppsFreezingScreen--;
+ mWmService.mLastFinishedFreezeSource = this;
+ }
+ if (unfreezeSurfaceNow) {
+ if (unfrozeWindows) {
+ mWmService.mWindowPlacerLocked.performSurfacePlacement();
+ }
+ mWmService.stopFreezingDisplayLocked();
+ }
+ }
+
void reportFullyDrawnLocked(boolean restoredFromBundle) {
final WindowingModeTransitionInfoSnapshot info = mStackSupervisor
.getActivityMetricsLogger().logAppTransitionReportedDrawn(this, restoredFromBundle);
@@ -3109,6 +5170,24 @@
}
}
+ void onFirstWindowDrawn(WindowState win, WindowStateAnimator winAnimator) {
+ firstWindowDrawn = true;
+
+ // We now have a good window to show, remove dead placeholders
+ removeDeadWindows();
+
+ if (startingWindow != null) {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Finish starting %s"
+ + ": first real window is shown, no animation", win.mToken);
+ // If this initial window is animating, stop it -- we will do an animation to reveal
+ // it from behind the starting window, so there is no need for it to also be doing its
+ // own stuff.
+ win.cancelAnimation();
+ }
+ removeStartingWindow();
+ updateReportedVisibilityLocked();
+ }
+
/** Called when the windows associated app window container are drawn. */
void onWindowsDrawn(boolean drawn, long timestampNs) {
mDrawn = drawn;
@@ -3130,7 +5209,7 @@
/** Called when the windows associated app window container are visible. */
void onWindowsVisible() {
- super.onWindowsVisible();
+ if (DEBUG_VISIBILITY) Slog.v(TAG_WM, "Reporting visible in " + appToken);
mStackSupervisor.stopWaitingForActivityVisible(this);
if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsVisibleLocked(): " + this);
if (!nowVisible) {
@@ -3142,11 +5221,197 @@
/** Called when the windows associated app window container are no longer visible. */
void onWindowsGone() {
- super.onWindowsGone();
+ if (DEBUG_VISIBILITY) Slog.v(TAG_WM, "Reporting gone in " + appToken);
if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsGone(): " + this);
nowVisible = false;
}
+ @Override
+ void checkAppWindowsReadyToShow() {
+ if (allDrawn == mLastAllDrawn) {
+ return;
+ }
+
+ mLastAllDrawn = allDrawn;
+ if (!allDrawn) {
+ return;
+ }
+
+ // The token has now changed state to having all windows shown... what to do, what to do?
+ if (mFreezingScreen) {
+ showAllWindowsLocked();
+ stopFreezingScreen(false, true);
+ ProtoLog.i(WM_DEBUG_ORIENTATION,
+ "Setting mOrientationChangeComplete=true because wtoken %s "
+ + "numInteresting=%d numDrawn=%d",
+ this, mNumInterestingWindows, mNumDrawnWindows);
+ // This will set mOrientationChangeComplete and cause a pass through layout.
+ setAppLayoutChanges(FINISH_LAYOUT_REDO_WALLPAPER,
+ "checkAppWindowsReadyToShow: freezingScreen");
+ } else {
+ setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM, "checkAppWindowsReadyToShow");
+
+ // We can now show all of the drawn windows!
+ if (!getDisplayContent().mOpeningApps.contains(this) && canShowWindows()) {
+ showAllWindowsLocked();
+ }
+ }
+ }
+
+ /**
+ * This must be called while inside a transaction.
+ */
+ void showAllWindowsLocked() {
+ forAllWindows(windowState -> {
+ if (DEBUG_VISIBILITY) Slog.v(TAG, "performing show on: " + windowState);
+ windowState.performShowLocked();
+ }, false /* traverseTopToBottom */);
+ }
+
+ void updateReportedVisibilityLocked() {
+ if (appToken == null) {
+ return;
+ }
+
+ if (DEBUG_VISIBILITY) Slog.v(TAG, "Update reported visibility: " + this);
+ final int count = mChildren.size();
+
+ mReportedVisibilityResults.reset();
+
+ for (int i = 0; i < count; i++) {
+ final WindowState win = mChildren.get(i);
+ win.updateReportedVisibility(mReportedVisibilityResults);
+ }
+
+ int numInteresting = mReportedVisibilityResults.numInteresting;
+ int numVisible = mReportedVisibilityResults.numVisible;
+ int numDrawn = mReportedVisibilityResults.numDrawn;
+ boolean nowGone = mReportedVisibilityResults.nowGone;
+
+ boolean nowDrawn = numInteresting > 0 && numDrawn >= numInteresting;
+ boolean nowVisible = numInteresting > 0 && numVisible >= numInteresting && !isHidden();
+ if (!nowGone) {
+ // If the app is not yet gone, then it can only become visible/drawn.
+ if (!nowDrawn) {
+ nowDrawn = reportedDrawn;
+ }
+ if (!nowVisible) {
+ nowVisible = reportedVisible;
+ }
+ }
+ if (DEBUG_VISIBILITY) Slog.v(TAG, "VIS " + this + ": interesting="
+ + numInteresting + " visible=" + numVisible);
+ if (nowDrawn != reportedDrawn) {
+ onWindowsDrawn(nowDrawn, SystemClock.elapsedRealtimeNanos());
+ reportedDrawn = nowDrawn;
+ }
+ if (nowVisible != reportedVisible) {
+ if (DEBUG_VISIBILITY) Slog.v(TAG,
+ "Visibility changed in " + this + ": vis=" + nowVisible);
+ reportedVisible = nowVisible;
+ if (nowVisible) {
+ onWindowsVisible();
+ } else {
+ onWindowsGone();
+ }
+ }
+ }
+
+ boolean isClientHidden() {
+ return mClientHidden;
+ }
+
+ void setClientHidden(boolean hideClient) {
+ if (mClientHidden == hideClient || (hideClient && mDeferHidingClient)) {
+ return;
+ }
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
+ "setClientHidden: %s clientHidden=%b Callers=%s", this, hideClient,
+ Debug.getCallers(5));
+ mClientHidden = hideClient;
+ sendAppVisibilityToClients();
+ }
+
+ /**
+ * Updated this app token tracking states for interesting and drawn windows based on the window.
+ *
+ * @return Returns true if the input window is considered interesting and drawn while all the
+ * windows in this app token where not considered drawn as of the last pass.
+ */
+ boolean updateDrawnWindowStates(WindowState w) {
+ w.setDrawnStateEvaluated(true /*evaluated*/);
+
+ if (DEBUG_STARTING_WINDOW_VERBOSE && w == startingWindow) {
+ Slog.d(TAG, "updateWindows: starting " + w + " isOnScreen=" + w.isOnScreen()
+ + " allDrawn=" + allDrawn + " freezingScreen=" + mFreezingScreen);
+ }
+
+ if (allDrawn && !mFreezingScreen) {
+ return false;
+ }
+
+ if (mLastTransactionSequence != mWmService.mTransactionSequence) {
+ mLastTransactionSequence = mWmService.mTransactionSequence;
+ mNumDrawnWindows = 0;
+ startingDisplayed = false;
+
+ // There is the main base application window, even if it is exiting, wait for it
+ mNumInterestingWindows = findMainWindow(false /* includeStartingApp */) != null ? 1 : 0;
+ }
+
+ final WindowStateAnimator winAnimator = w.mWinAnimator;
+
+ boolean isInterestingAndDrawn = false;
+
+ if (!allDrawn && w.mightAffectAllDrawn()) {
+ if (DEBUG_VISIBILITY || WM_DEBUG_ORIENTATION.isLogToLogcat()) {
+ Slog.v(TAG, "Eval win " + w + ": isDrawn=" + w.isDrawnLw()
+ + ", isAnimationSet=" + isSelfAnimating());
+ if (!w.isDrawnLw()) {
+ Slog.v(TAG, "Not displayed: s=" + winAnimator.mSurfaceController
+ + " pv=" + w.isVisibleByPolicy()
+ + " mDrawState=" + winAnimator.drawStateToString()
+ + " ph=" + w.isParentWindowHidden() + " th=" + hiddenRequested
+ + " a=" + isSelfAnimating());
+ }
+ }
+
+ if (w != startingWindow) {
+ if (w.isInteresting()) {
+ // Add non-main window as interesting since the main app has already been added
+ if (findMainWindow(false /* includeStartingApp */) != w) {
+ mNumInterestingWindows++;
+ }
+ if (w.isDrawnLw()) {
+ mNumDrawnWindows++;
+
+ if (DEBUG_VISIBILITY || WM_DEBUG_ORIENTATION.isLogToLogcat()) {
+ Slog.v(TAG, "tokenMayBeDrawn: "
+ + this + " w=" + w + " numInteresting=" + mNumInterestingWindows
+ + " freezingScreen=" + mFreezingScreen
+ + " mAppFreezing=" + w.mAppFreezing);
+ }
+
+ isInterestingAndDrawn = true;
+ }
+ }
+ } else if (w.isDrawnLw()) {
+ onStartingWindowDrawn(SystemClock.uptimeMillis());
+ startingDisplayed = true;
+ }
+ }
+
+ return isInterestingAndDrawn;
+ }
+
+ /** Called when the starting window for this container is drawn. */
+ private void onStartingWindowDrawn(long timestamp) {
+ synchronized (mAtmService.mGlobalLock) {
+ mAtmService.mStackSupervisor.getActivityMetricsLogger().notifyStartingWindowDrawn(
+ getWindowingMode(), timestamp);
+ }
+ }
+
/**
* Called when the key dispatching to a window associated with the app window container
* timed-out.
@@ -3361,6 +5626,780 @@
}
}
+ void postWindowRemoveStartingWindowCleanup(WindowState win) {
+ // TODO: Something smells about the code below...Is there a better way?
+ if (startingWindow == win) {
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Notify removed startingWindow %s", win);
+ removeStartingWindow();
+ } else if (mChildren.size() == 0) {
+ // If this is the last window and we had requested a starting transition window,
+ // well there is no point now.
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Nulling last startingData");
+ mStartingData = null;
+ if (mHiddenSetFromTransferredStartingWindow) {
+ // We set the hidden state to false for the token from a transferred starting window.
+ // We now reset it back to true since the starting window was the last window in the
+ // token.
+ setHidden(true);
+ }
+ } else if (mChildren.size() == 1 && startingSurface != null && !isRelaunching()) {
+ // If this is the last window except for a starting transition window,
+ // we need to get rid of the starting transition.
+ ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Last window, removing starting window %s", win);
+ removeStartingWindow();
+ }
+ }
+
+ void removeDeadWindows() {
+ for (int winNdx = mChildren.size() - 1; winNdx >= 0; --winNdx) {
+ WindowState win = mChildren.get(winNdx);
+ if (win.mAppDied) {
+ ProtoLog.w(WM_DEBUG_ADD_REMOVE,
+ "removeDeadWindows: %s", win);
+ // Set mDestroying, we don't want any animation or delayed removal here.
+ win.mDestroying = true;
+ // Also removes child windows.
+ win.removeIfPossible();
+ }
+ }
+ }
+
+ boolean hasWindowsAlive() {
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ // No need to loop through child windows as the answer should be the same as that of the
+ // parent window.
+ if (!(mChildren.get(i)).mAppDied) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ void setWillReplaceWindows(boolean animate) {
+ ProtoLog.d(WM_DEBUG_ADD_REMOVE,
+ "Marking app token %s with replacing windows.", this);
+
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState w = mChildren.get(i);
+ w.setWillReplaceWindow(animate);
+ }
+ }
+
+ void setWillReplaceChildWindows() {
+ ProtoLog.d(WM_DEBUG_ADD_REMOVE, "Marking app token %s"
+ + " with replacing child windows.", this);
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState w = mChildren.get(i);
+ w.setWillReplaceChildWindows();
+ }
+ }
+
+ void clearWillReplaceWindows() {
+ ProtoLog.d(WM_DEBUG_ADD_REMOVE,
+ "Resetting app token %s of replacing window marks.", this);
+
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState w = mChildren.get(i);
+ w.clearWillReplaceWindow();
+ }
+ }
+
+ void requestUpdateWallpaperIfNeeded() {
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState w = mChildren.get(i);
+ w.requestUpdateWallpaperIfNeeded();
+ }
+ }
+
+ /**
+ * @return The to top most child window for which {@link LayoutParams#isFullscreen()} returns
+ * true.
+ */
+ WindowState getTopFullscreenWindow() {
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState win = mChildren.get(i);
+ if (win != null && win.mAttrs.isFullscreen()) {
+ return win;
+ }
+ }
+ return null;
+ }
+
+ WindowState findMainWindow() {
+ return findMainWindow(true);
+ }
+
+ /**
+ * Finds the main window that either has type base application or application starting if
+ * requested.
+ *
+ * @param includeStartingApp Allow to search application-starting windows to also be returned.
+ * @return The main window of type base application or application starting if requested.
+ */
+ WindowState findMainWindow(boolean includeStartingApp) {
+ WindowState candidate = null;
+ for (int j = mChildren.size() - 1; j >= 0; --j) {
+ final WindowState win = mChildren.get(j);
+ final int type = win.mAttrs.type;
+ // No need to loop through child window as base application and starting types can't be
+ // child windows.
+ if (type == TYPE_BASE_APPLICATION
+ || (includeStartingApp && type == TYPE_APPLICATION_STARTING)) {
+ // In cases where there are multiple windows, we prefer the non-exiting window. This
+ // happens for example when replacing windows during an activity relaunch. When
+ // constructing the animation, we want the new window, not the exiting one.
+ if (win.mAnimatingExit) {
+ candidate = win;
+ } else {
+ return win;
+ }
+ }
+ }
+ return candidate;
+ }
+
+ SurfaceControl getAppAnimationLayer() {
+ return getAppAnimationLayer(isActivityTypeHome() ? ANIMATION_LAYER_HOME
+ : needsZBoost() ? ANIMATION_LAYER_BOOSTED
+ : ANIMATION_LAYER_STANDARD);
+ }
+
+ @Override
+ boolean needsZBoost() {
+ return mNeedsZBoost || super.needsZBoost();
+ }
+
+ @Override
+ public SurfaceControl getAnimationLeashParent() {
+ // For transitions in the pinned stack (menu activity) we just let them occur as a child
+ // of the pinned stack.
+ // All normal app transitions take place in an animation layer which is below the pinned
+ // stack but may be above the parent stacks of the given animating apps by default. When
+ // a new hierarchical animation is enabled, we just let them occur as a child of the parent
+ // stack, i.e. the hierarchy of the surfaces is unchanged.
+ if (inPinnedWindowingMode()) {
+ return getStack().getSurfaceControl();
+ } else if (WindowManagerService.sHierarchicalAnimations) {
+ return super.getAnimationLeashParent();
+ } else {
+ return getAppAnimationLayer();
+ }
+ }
+
+
+ @VisibleForTesting
+ boolean shouldAnimate(int transit) {
+ final boolean isSplitScreenPrimary =
+ getWindowingMode() == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
+ final boolean allowSplitScreenPrimaryAnimation = transit != TRANSIT_WALLPAPER_OPEN;
+
+ // Don't animate while the task runs recents animation but only if we are in the mode
+ // where we cancel with deferred screenshot, which means that the controller has
+ // transformed the task.
+ final RecentsAnimationController controller = mWmService.getRecentsAnimationController();
+ if (controller != null && controller.isAnimatingTask(getTask())
+ && controller.shouldDeferCancelUntilNextTransition()) {
+ return false;
+ }
+
+ // We animate always if it's not split screen primary, and only some special cases in split
+ // screen primary because it causes issues with stack clipping when we run an un-minimize
+ // animation at the same time.
+ return !isSplitScreenPrimary || allowSplitScreenPrimaryAnimation;
+ }
+
+ /**
+ * Creates a layer to apply crop to an animation.
+ */
+ private SurfaceControl createAnimationBoundsLayer(Transaction t) {
+ ProtoLog.i(WM_DEBUG_APP_TRANSITIONS_ANIM, "Creating animation bounds layer");
+ final SurfaceControl.Builder builder = makeAnimationLeash()
+ .setParent(getAnimationLeashParent())
+ .setName(getSurfaceControl() + " - animation-bounds");
+ final SurfaceControl boundsLayer = builder.build();
+ t.show(boundsLayer);
+ return boundsLayer;
+ }
+
+ boolean applyAnimationLocked(WindowManager.LayoutParams lp, int transit, boolean enter,
+ boolean isVoiceInteraction) {
+
+ if (mWmService.mDisableTransitionAnimation || !shouldAnimate(transit)) {
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS_ANIM,
+ "applyAnimation: transition animation is disabled or skipped. "
+ + "atoken=%s", this);
+ cancelAnimation();
+ return false;
+ }
+
+ // Only apply an animation if the display isn't frozen. If it is frozen, there is no reason
+ // to animate and it can cause strange artifacts when we unfreeze the display if some
+ // different animation is running.
+ Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "AWT#applyAnimationLocked");
+ if (okToAnimate()) {
+ final AnimationAdapter adapter;
+ AnimationAdapter thumbnailAdapter = null;
+
+ final int appStackClipMode =
+ getDisplayContent().mAppTransition.getAppStackClipMode();
+
+ // Separate position and size for use in animators.
+ mTmpRect.set(getAnimationBounds(appStackClipMode));
+ mTmpPoint.set(mTmpRect.left, mTmpRect.top);
+ mTmpRect.offsetTo(0, 0);
+
+ final boolean isChanging = AppTransition.isChangeTransit(transit) && enter
+ && getDisplayContent().mChangingApps.contains(this);
+
+ // Delaying animation start isn't compatible with remote animations at all.
+ if (getDisplayContent().mAppTransition.getRemoteAnimationController() != null
+ && !mSurfaceAnimator.isAnimationStartDelayed()) {
+ RemoteAnimationController.RemoteAnimationRecord adapters =
+ getDisplayContent().mAppTransition.getRemoteAnimationController()
+ .createRemoteAnimationRecord(this, mTmpPoint, mTmpRect,
+ (isChanging ? mTransitStartRect : null));
+ adapter = adapters.mAdapter;
+ thumbnailAdapter = adapters.mThumbnailAdapter;
+ } else if (isChanging) {
+ final float durationScale = mWmService.getTransitionAnimationScaleLocked();
+ mTmpRect.offsetTo(mTmpPoint.x, mTmpPoint.y);
+ adapter = new LocalAnimationAdapter(
+ new WindowChangeAnimationSpec(mTransitStartRect, mTmpRect,
+ getDisplayContent().getDisplayInfo(), durationScale,
+ true /* isAppAnimation */, false /* isThumbnail */),
+ mWmService.mSurfaceAnimationRunner);
+ if (mThumbnail != null) {
+ thumbnailAdapter = new LocalAnimationAdapter(
+ new WindowChangeAnimationSpec(mTransitStartRect, mTmpRect,
+ getDisplayContent().getDisplayInfo(), durationScale,
+ true /* isAppAnimation */, true /* isThumbnail */),
+ mWmService.mSurfaceAnimationRunner);
+ }
+ mTransit = transit;
+ mTransitFlags = getDisplayContent().mAppTransition.getTransitFlags();
+ } else {
+ mNeedsAnimationBoundsLayer = (appStackClipMode == STACK_CLIP_AFTER_ANIM);
+
+ final Animation a = loadAnimation(lp, transit, enter, isVoiceInteraction);
+ if (a != null) {
+ // Only apply corner radius to animation if we're not in multi window mode.
+ // We don't want rounded corners when in pip or split screen.
+ final float windowCornerRadius = !inMultiWindowMode()
+ ? getDisplayContent().getWindowCornerRadius()
+ : 0;
+ adapter = new LocalAnimationAdapter(
+ new WindowAnimationSpec(a, mTmpPoint, mTmpRect,
+ getDisplayContent().mAppTransition.canSkipFirstFrame(),
+ appStackClipMode,
+ true /* isAppAnimation */,
+ windowCornerRadius),
+ mWmService.mSurfaceAnimationRunner);
+ if (a.getZAdjustment() == Animation.ZORDER_TOP) {
+ mNeedsZBoost = true;
+ }
+ mTransit = transit;
+ mTransitFlags = getDisplayContent().mAppTransition.getTransitFlags();
+ } else {
+ adapter = null;
+ }
+ }
+ if (adapter != null) {
+ startAnimation(getPendingTransaction(), adapter, !isVisible());
+ if (adapter.getShowWallpaper()) {
+ mDisplayContent.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;
+ }
+ if (thumbnailAdapter != null) {
+ mThumbnail.startAnimation(
+ getPendingTransaction(), thumbnailAdapter, !isVisible());
+ }
+ }
+ } else {
+ cancelAnimation();
+ }
+ Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
+
+ return isReallyAnimating();
+ }
+
+ private Animation loadAnimation(WindowManager.LayoutParams lp, int transit, boolean enter,
+ boolean isVoiceInteraction) {
+ final DisplayContent displayContent = getTask().getDisplayContent();
+ final DisplayInfo displayInfo = displayContent.getDisplayInfo();
+ final int width = displayInfo.appWidth;
+ final int height = displayInfo.appHeight;
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS_ANIM,
+ "applyAnimation: atoken=%s", this);
+
+ // Determine the visible rect to calculate the thumbnail clip
+ final WindowState win = findMainWindow();
+ final Rect frame = new Rect(0, 0, width, height);
+ final Rect displayFrame = new Rect(0, 0,
+ displayInfo.logicalWidth, displayInfo.logicalHeight);
+ final Rect insets = new Rect();
+ final Rect stableInsets = new Rect();
+ Rect surfaceInsets = null;
+ final boolean freeform = win != null && win.inFreeformWindowingMode();
+ if (win != null) {
+ // Containing frame will usually cover the whole screen, including dialog windows.
+ // For freeform workspace windows it will not cover the whole screen and it also
+ // won't exactly match the final freeform window frame (e.g. when overlapping with
+ // the status bar). In that case we need to use the final frame.
+ if (freeform) {
+ frame.set(win.getFrameLw());
+ } else if (win.isLetterboxedAppWindow()) {
+ frame.set(getTask().getBounds());
+ } else if (win.isDockedResizing()) {
+ // If we are animating while docked resizing, then use the stack bounds as the
+ // animation target (which will be different than the task bounds)
+ frame.set(getTask().getParent().getBounds());
+ } else {
+ frame.set(win.getContainingFrame());
+ }
+ surfaceInsets = win.getAttrs().surfaceInsets;
+ // XXX(b/72757033): These are insets relative to the window frame, but we're really
+ // interested in the insets relative to the frame we chose in the if-blocks above.
+ win.getContentInsets(insets);
+ win.getStableInsets(stableInsets);
+ }
+
+ if (mLaunchTaskBehind) {
+ // Differentiate the two animations. This one which is briefly on the screen
+ // gets the !enter animation, and the other activity which remains on the
+ // screen gets the enter animation. Both appear in the mOpeningApps set.
+ enter = false;
+ }
+ ProtoLog.d(WM_DEBUG_APP_TRANSITIONS,
+ "Loading animation for app transition. transit=%s enter=%b frame=%s insets=%s "
+ + "surfaceInsets=%s",
+ AppTransition.appTransitionToString(transit), enter, frame, insets, surfaceInsets);
+ final Configuration displayConfig = displayContent.getConfiguration();
+ final Animation a = getDisplayContent().mAppTransition.loadAnimation(lp, transit, enter,
+ displayConfig.uiMode, displayConfig.orientation, frame, displayFrame, insets,
+ surfaceInsets, stableInsets, isVoiceInteraction, freeform, getTask().mTaskId);
+ if (a != null) {
+ if (DEBUG_ANIM) logWithStack(TAG, "Loaded animation " + a + " for " + this);
+ final int containingWidth = frame.width();
+ final int containingHeight = frame.height();
+ a.initialize(containingWidth, containingHeight, width, height);
+ a.scaleCurrentDuration(mWmService.getTransitionAnimationScaleLocked());
+ }
+ return a;
+ }
+
+ @Override
+ public boolean shouldDeferAnimationFinish(Runnable endDeferFinishCallback) {
+ return mAnimatingActivityRegistry != null
+ && mAnimatingActivityRegistry.notifyAboutToFinish(
+ this, endDeferFinishCallback);
+ }
+
+ private boolean shouldStartChangeTransition(int prevWinMode, int newWinMode) {
+ if (mWmService.mDisableTransitionAnimation
+ || !isVisible()
+ || getDisplayContent().mAppTransition.isTransitionSet()
+ || getSurfaceControl() == null) {
+ return false;
+ }
+ // Only do an animation into and out-of freeform mode for now. Other mode
+ // transition animations are currently handled by system-ui.
+ return (prevWinMode == WINDOWING_MODE_FREEFORM) != (newWinMode == WINDOWING_MODE_FREEFORM);
+ }
+
+ boolean isWaitingForTransitionStart() {
+ final DisplayContent dc = getDisplayContent();
+ // TODO: Test for null can be removed once unification is done.
+ if (dc == null) return false;
+ return dc.mAppTransition.isTransitionSet()
+ && (dc.mOpeningApps.contains(this)
+ || dc.mClosingApps.contains(this)
+ || dc.mChangingApps.contains(this));
+ }
+
+ /**
+ * Initializes a change transition. Because the app is visible already, there is a small period
+ * of time where the user can see the app content/window update before the transition starts.
+ * To prevent this, we immediately take a snapshot and place the app/snapshot into a leash which
+ * "freezes" the location/crop until the transition starts.
+ * <p>
+ * Here's a walk-through of the process:
+ * 1. Create a temporary leash ("interim-change-leash") and reparent the app to it.
+ * 2. Set the temporary leash's position/crop to the current state.
+ * 3. Create a snapshot and place that at the top of the leash to cover up content changes.
+ * 4. Once the transition is ready, it will reparent the app to the animation leash.
+ * 5. Detach the interim-change-leash.
+ */
+ private void initializeChangeTransition(Rect startBounds) {
+ mDisplayContent.prepareAppTransition(TRANSIT_TASK_CHANGE_WINDOWING_MODE,
+ false /* alwaysKeepCurrent */, 0, false /* forceOverride */);
+ mDisplayContent.mChangingApps.add(this);
+ mTransitStartRect.set(startBounds);
+
+ final SurfaceControl.Builder builder = makeAnimationLeash()
+ .setParent(getAnimationLeashParent())
+ .setName(getSurfaceControl() + " - interim-change-leash");
+ mTransitChangeLeash = builder.build();
+ Transaction t = getPendingTransaction();
+ t.setWindowCrop(mTransitChangeLeash, startBounds.width(), startBounds.height());
+ t.setPosition(mTransitChangeLeash, startBounds.left, startBounds.top);
+ t.show(mTransitChangeLeash);
+ t.reparent(getSurfaceControl(), mTransitChangeLeash);
+ onAnimationLeashCreated(t, mTransitChangeLeash);
+
+ // Skip creating snapshot if this transition is controlled by a remote animator which
+ // doesn't need it.
+ ArraySet<Integer> activityTypes = new ArraySet<>();
+ activityTypes.add(getActivityType());
+ RemoteAnimationAdapter adapter =
+ mDisplayContent.mAppTransitionController.getRemoteAnimationOverride(
+ this, TRANSIT_TASK_CHANGE_WINDOWING_MODE, activityTypes);
+ if (adapter != null && !adapter.getChangeNeedsSnapshot()) {
+ return;
+ }
+
+ Task task = getTask();
+ if (mThumbnail == null && task != null && !hasCommittedReparentToAnimationLeash()) {
+ SurfaceControl.ScreenshotGraphicBuffer snapshot =
+ mWmService.mTaskSnapshotController.createTaskSnapshot(
+ task, 1 /* scaleFraction */);
+ if (snapshot != null) {
+ mThumbnail = new AppWindowThumbnail(mWmService.mSurfaceFactory, t, this,
+ snapshot.getGraphicBuffer(), true /* relative */);
+ }
+ }
+ }
+
+ @Override
+ public void onAnimationLeashCreated(Transaction t, SurfaceControl leash) {
+ // The leash is parented to the animation layer. We need to preserve the z-order by using
+ // the prefix order index, but we boost if necessary.
+ int layer = 0;
+ if (!inPinnedWindowingMode()) {
+ layer = getPrefixOrderIndex();
+ } else {
+ // Pinned stacks have animations take place within themselves rather than an animation
+ // layer so we need to preserve the order relative to the stack (e.g. the order of our
+ // task/parent).
+ layer = getParent().getPrefixOrderIndex();
+ }
+
+ if (mNeedsZBoost) {
+ layer += Z_BOOST_BASE;
+ }
+ if (!mNeedsAnimationBoundsLayer) {
+ t.setLayer(leash, layer);
+ }
+
+ final DisplayContent dc = getDisplayContent();
+ dc.assignStackOrdering();
+
+ if (leash == mTransitChangeLeash) {
+ // This is a temporary state so skip any animation notifications
+ return;
+ } else if (mTransitChangeLeash != null) {
+ // unparent mTransitChangeLeash for clean-up
+ clearChangeLeash(t, false /* cancel */);
+ }
+
+ if (mAnimatingActivityRegistry != null) {
+ mAnimatingActivityRegistry.notifyStarting(this);
+ }
+
+ // If the animation needs to be cropped then an animation bounds layer is created as a child
+ // of the pinned stack or animation layer. The leash is then reparented to this new layer.
+ if (mNeedsAnimationBoundsLayer) {
+ mTmpRect.setEmpty();
+ final Task task = getTask();
+ if (getDisplayContent().mAppTransitionController.isTransitWithinTask(
+ getTransit(), task)) {
+ task.getBounds(mTmpRect);
+ } else {
+ final TaskStack stack = getStack();
+ if (stack == null) {
+ return;
+ }
+ // Set clip rect to stack bounds.
+ stack.getBounds(mTmpRect);
+ }
+ mAnimationBoundsLayer = createAnimationBoundsLayer(t);
+
+ // Crop to stack bounds.
+ t.setWindowCrop(mAnimationBoundsLayer, mTmpRect);
+ t.setLayer(mAnimationBoundsLayer, layer);
+
+ // Reparent leash to animation bounds layer.
+ t.reparent(leash, mAnimationBoundsLayer);
+ }
+ }
+
+ @Override
+ void prepareSurfaces() {
+ // isSelfAnimating also returns true when we are about to start a transition, so we need
+ // to check super here.
+ final boolean reallyAnimating = super.isSelfAnimating();
+ final boolean show = !isHidden() || reallyAnimating;
+
+ if (mSurfaceControl != null) {
+ if (show && !mLastSurfaceShowing) {
+ getPendingTransaction().show(mSurfaceControl);
+ } else if (!show && mLastSurfaceShowing) {
+ getPendingTransaction().hide(mSurfaceControl);
+ }
+ }
+ if (mThumbnail != null) {
+ mThumbnail.setShowing(getPendingTransaction(), show);
+ }
+ mLastSurfaceShowing = show;
+ super.prepareSurfaces();
+ }
+
+ /**
+ * @return Whether our {@link #getSurfaceControl} is currently showing.
+ */
+ boolean isSurfaceShowing() {
+ return mLastSurfaceShowing;
+ }
+
+ boolean isInChangeTransition() {
+ return mTransitChangeLeash != null || AppTransition.isChangeTransit(mTransit);
+ }
+
+ void attachThumbnailAnimation() {
+ if (!isReallyAnimating()) {
+ return;
+ }
+ final int taskId = getTask().mTaskId;
+ final GraphicBuffer thumbnailHeader =
+ getDisplayContent().mAppTransition.getAppTransitionThumbnailHeader(taskId);
+ if (thumbnailHeader == null) {
+ ProtoLog.d(WM_DEBUG_APP_TRANSITIONS, "No thumbnail header bitmap for: %d", taskId);
+ return;
+ }
+ clearThumbnail();
+ mThumbnail = new AppWindowThumbnail(mWmService.mSurfaceFactory, getPendingTransaction(),
+ this, thumbnailHeader);
+ mThumbnail.startAnimation(getPendingTransaction(), loadThumbnailAnimation(thumbnailHeader));
+ }
+
+ /**
+ * Attaches a surface with a thumbnail for the
+ * {@link android.app.ActivityOptions#ANIM_OPEN_CROSS_PROFILE_APPS} animation.
+ */
+ void attachCrossProfileAppsThumbnailAnimation() {
+ if (!isReallyAnimating()) {
+ return;
+ }
+ clearThumbnail();
+
+ final WindowState win = findMainWindow();
+ if (win == null) {
+ return;
+ }
+ final Rect frame = win.getFrameLw();
+ final int thumbnailDrawableRes = getTask().mUserId == mWmService.mCurrentUserId
+ ? R.drawable.ic_account_circle
+ : R.drawable.ic_corp_badge;
+ final GraphicBuffer thumbnail =
+ getDisplayContent().mAppTransition
+ .createCrossProfileAppsThumbnail(thumbnailDrawableRes, frame);
+ if (thumbnail == null) {
+ return;
+ }
+ mThumbnail = new AppWindowThumbnail(mWmService.mSurfaceFactory,
+ getPendingTransaction(), this, thumbnail);
+ final Animation animation =
+ getDisplayContent().mAppTransition.createCrossProfileAppsThumbnailAnimationLocked(
+ win.getFrameLw());
+ mThumbnail.startAnimation(getPendingTransaction(), animation, new Point(frame.left,
+ frame.top));
+ }
+
+ private Animation loadThumbnailAnimation(GraphicBuffer thumbnailHeader) {
+ final DisplayInfo displayInfo = mDisplayContent.getDisplayInfo();
+
+ // If this is a multi-window scenario, we use the windows frame as
+ // destination of the thumbnail header animation. If this is a full screen
+ // window scenario, we use the whole display as the target.
+ WindowState win = findMainWindow();
+ Rect appRect = win != null ? win.getContentFrameLw() :
+ new Rect(0, 0, displayInfo.appWidth, displayInfo.appHeight);
+ final Rect insets = win != null ? win.getContentInsets() : null;
+ final Configuration displayConfig = mDisplayContent.getConfiguration();
+ return getDisplayContent().mAppTransition.createThumbnailAspectScaleAnimationLocked(
+ appRect, insets, thumbnailHeader, getTask().mTaskId, displayConfig.uiMode,
+ displayConfig.orientation);
+ }
+
+ @Override
+ boolean isAppAnimating() {
+ return isSelfAnimating();
+ }
+
+ @Override
+ boolean isSelfAnimating() {
+ // If we are about to start a transition, we also need to be considered animating.
+ return isWaitingForTransitionStart() || isReallyAnimating();
+ }
+
+ @Override
+ public void onAnimationLeashLost(Transaction t) {
+ super.onAnimationLeashLost(t);
+ if (mAnimationBoundsLayer != null) {
+ t.remove(mAnimationBoundsLayer);
+ mAnimationBoundsLayer = null;
+ }
+
+ if (mAnimatingActivityRegistry != null) {
+ mAnimatingActivityRegistry.notifyFinished(this);
+ }
+ }
+
+ @Override
+ protected void onAnimationFinished() {
+ super.onAnimationFinished();
+
+ Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "AWT#onAnimationFinished");
+ mTransit = TRANSIT_UNSET;
+ mTransitFlags = 0;
+ mNeedsZBoost = false;
+ mNeedsAnimationBoundsLayer = false;
+
+ setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM | FINISH_LAYOUT_REDO_WALLPAPER,
+ "AppWindowToken");
+
+ clearThumbnail();
+ setClientHidden(isHidden() && hiddenRequested);
+
+ getDisplayContent().computeImeTargetIfNeeded(this);
+
+ if (DEBUG_ANIM) Slog.v(TAG, "Animation done in " + this
+ + ": reportedVisible=" + reportedVisible
+ + " okToDisplay=" + okToDisplay()
+ + " okToAnimate=" + okToAnimate()
+ + " startingDisplayed=" + startingDisplayed);
+
+ // clean up thumbnail window
+ if (mThumbnail != null) {
+ mThumbnail.destroy();
+ mThumbnail = null;
+ }
+
+ // WindowState.onExitAnimationDone might modify the children list, so make a copy and then
+ // traverse the copy.
+ final ArrayList<WindowState> children = new ArrayList<>(mChildren);
+ children.forEach(WindowState::onExitAnimationDone);
+
+ getDisplayContent().mAppTransition.notifyAppTransitionFinishedLocked(token);
+ scheduleAnimation();
+
+ if (mAtmService.mRootActivityContainer.allResumedActivitiesIdle()
+ || mAtmService.mStackSupervisor.isStoppingNoHistoryActivity()) {
+ // If all activities are already idle or there is an activity that must be
+ // stopped immediately after visible, then we now need to make sure we perform
+ // the full stop of this activity. This is because we won't do that while they are still
+ // waiting for the animation to finish.
+ if (mAtmService.mStackSupervisor.mStoppingActivities.contains(this)) {
+ mAtmService.mStackSupervisor.scheduleIdleLocked();
+ }
+ } else {
+ // Instead of doing the full stop routine here, let's just hide any activities
+ // we now can, and let them stop when the normal idle happens.
+ mAtmService.mStackSupervisor.processStoppingActivitiesLocked(null /* idleActivity */,
+ false /* remove */, true /* processPausingActivities */);
+ }
+ Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
+ }
+
+ /**
+ * @param cancel {@code true} if clearing the leash due to cancelling instead of transferring
+ * to another leash.
+ */
+ private void clearChangeLeash(Transaction t, boolean cancel) {
+ if (mTransitChangeLeash == null) {
+ return;
+ }
+ if (cancel) {
+ clearThumbnail();
+ SurfaceControl sc = getSurfaceControl();
+ SurfaceControl parentSc = getParentSurfaceControl();
+ // Don't reparent if surface is getting destroyed
+ if (parentSc != null && sc != null) {
+ t.reparent(sc, getParentSurfaceControl());
+ }
+ }
+ t.hide(mTransitChangeLeash);
+ t.remove(mTransitChangeLeash);
+ mTransitChangeLeash = null;
+ if (cancel) {
+ onAnimationLeashLost(t);
+ }
+ }
+
+ void clearAnimatingFlags() {
+ boolean wallpaperMightChange = false;
+ for (int i = mChildren.size() - 1; i >= 0; i--) {
+ final WindowState win = mChildren.get(i);
+ wallpaperMightChange |= win.clearAnimatingFlags();
+ }
+ if (wallpaperMightChange) {
+ requestUpdateWallpaperIfNeeded();
+ }
+ }
+
+ /**
+ * @return True if and only if we are actually running an animation. Note that
+ * {@link #isSelfAnimating} also returns true if we are waiting for an animation to
+ * start.
+ */
+ private boolean isReallyAnimating() {
+ return super.isSelfAnimating();
+ }
+
+ @Override
+ void cancelAnimation() {
+ cancelAnimationOnly();
+ clearThumbnail();
+ clearChangeLeash(getPendingTransaction(), true /* cancel */);
+ }
+
+ /**
+ * This only cancels the animation. It doesn't do other teardown like cleaning-up thumbnail
+ * or interim leashes.
+ * <p>
+ * Used when canceling in preparation for starting a new animation.
+ */
+ void cancelAnimationOnly() {
+ super.cancelAnimation();
+ }
+
+ @VisibleForTesting
+ AppWindowThumbnail getThumbnail() {
+ return mThumbnail;
+ }
+
+ private void clearThumbnail() {
+ if (mThumbnail == null) {
+ return;
+ }
+ mThumbnail.destroy();
+ mThumbnail = null;
+ }
+
+ public int getTransit() {
+ return mTransit;
+ }
+
+ int getTransitFlags() {
+ return mTransitFlags;
+ }
+
+ void registerRemoteAnimations(RemoteAnimationDefinition definition) {
+ mRemoteAnimationDefinition = definition;
+ }
+
+ RemoteAnimationDefinition getRemoteAnimationDefinition() {
+ return mRemoteAnimationDefinition;
+ }
+
void setRequestedOrientation(int requestedOrientation) {
setOrientation(requestedOrientation, mayFreezeScreenLocked());
mAtmService.getTaskChangeNotificationController().notifyActivityRequestedOrientationChanged(
@@ -3380,6 +6419,49 @@
}
}
+ void reportDescendantOrientationChangeIfNeeded() {
+ // Orientation request is exposed only when we're visible. Therefore visibility change
+ // will change requested orientation. Notify upward the hierarchy ladder to adjust
+ // configuration. This is important to cases where activities with incompatible
+ // orientations launch, or user goes back from an activity of bi-orientation to an
+ // activity with specified orientation.
+ if (getRequestedOrientation() == SCREEN_ORIENTATION_UNSET) {
+ return;
+ }
+
+ final IBinder freezeToken = mayFreezeScreenLocked() ? appToken : null;
+ onDescendantOrientationChanged(freezeToken, this);
+ }
+
+ /**
+ * We override because this class doesn't want its children affecting its reported orientation
+ * in anyway.
+ */
+ @Override
+ int getOrientation(int candidate) {
+ if (candidate == SCREEN_ORIENTATION_BEHIND) {
+ // Allow app to specify orientation regardless of its visibility state if the current
+ // candidate want us to use orientation behind. I.e. the visible app on-top of this one
+ // wants us to use the orientation of the app behind it.
+ return mOrientation;
+ }
+
+ // The {@link ActivityRecord} should only specify an orientation when it is not closing or
+ // going to the bottom. Allowing closing {@link ActivityRecord} to participate can lead to
+ // an Activity in another task being started in the wrong orientation during the transition.
+ if (!(sendingToBottom || getDisplayContent().mClosingApps.contains(this))
+ && (isVisible() || getDisplayContent().mOpeningApps.contains(this))) {
+ return mOrientation;
+ }
+
+ return SCREEN_ORIENTATION_UNSET;
+ }
+
+ /** Returns the app's preferred orientation regardless of its currently visibility state. */
+ int getRequestedOrientation() {
+ return mOrientation;
+ }
+
/**
* Set the last reported global configuration to the client. Should be called whenever a new
* global configuration is sent to the client for this activity.
@@ -3479,6 +6561,10 @@
&& !mAtmService.mForceResizableActivities;
}
+ boolean hasSizeCompatBounds() {
+ return mSizeCompatBounds != null;
+ }
+
// TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer.
private void updateOverrideConfiguration() {
final Configuration overrideConfig = mTmpConfig;
@@ -3535,6 +6621,22 @@
}
@Override
+ public boolean matchParentBounds() {
+ if (super.matchParentBounds()) {
+ return true;
+ }
+ // An activity in size compatibility mode may have override bounds which equals to its
+ // parent bounds, so the exact bounds should also be checked.
+ final WindowContainer parent = getParent();
+ return parent == null || parent.getBounds().equals(getResolvedOverrideBounds());
+ }
+
+ @Override
+ float getSizeCompatScale() {
+ return hasSizeCompatBounds() ? mSizeCompatScale : super.getSizeCompatScale();
+ }
+
+ @Override
void resolveOverrideConfiguration(Configuration newParentConfiguration) {
if (mCompatDisplayInsets != null) {
resolveSizeCompatModeConfiguration(newParentConfiguration);
@@ -3630,7 +6732,7 @@
mCompatDisplayInsets);
// The horizontal inset included in width is not needed if the activity cannot fill the
- // parent, because the offset will be applied by {@link AppWindowToken#mSizeCompatBounds}.
+ // parent, because the offset will be applied by {@link ActivityRecord#mSizeCompatBounds}.
final Rect resolvedAppBounds = resolvedConfig.windowConfiguration.getAppBounds();
final Rect parentAppBounds = newParentConfiguration.windowConfiguration.getAppBounds();
if (resolvedBounds.width() < parentAppBounds.width()) {
@@ -3644,9 +6746,100 @@
}
@Override
+ public Rect getBounds() {
+ if (mSizeCompatBounds != null) {
+ return mSizeCompatBounds;
+ }
+ return super.getBounds();
+ }
+
+ @Override
+ Rect getDisplayedBounds() {
+ final Task task = getTask();
+ if (task != null) {
+ final Rect overrideDisplayedBounds = task.getOverrideDisplayedBounds();
+ if (!overrideDisplayedBounds.isEmpty()) {
+ return overrideDisplayedBounds;
+ }
+ }
+ return getBounds();
+ }
+
+ @VisibleForTesting
+ Rect getAnimationBounds(int appStackClipMode) {
+ if (appStackClipMode == STACK_CLIP_BEFORE_ANIM && getStack() != null) {
+ // Using the stack bounds here effectively applies the clipping before animation.
+ return getStack().getBounds();
+ }
+ // Use task-bounds if available so that activity-level letterbox (maxAspectRatio) is
+ // included in the animation.
+ return getTask() != null ? getTask().getBounds() : getBounds();
+ }
+
+ /**
+ * Calculates the scale and offset to horizontal center the size compatibility bounds into the
+ * region which is available to application.
+ */
+ private void calculateCompatBoundsTransformation(Configuration newParentConfig) {
+ final Rect parentAppBounds = newParentConfig.windowConfiguration.getAppBounds();
+ final Rect parentBounds = newParentConfig.windowConfiguration.getBounds();
+ final Rect viewportBounds = parentAppBounds != null ? parentAppBounds : parentBounds;
+ final Rect appBounds = getWindowConfiguration().getAppBounds();
+ final Rect contentBounds = appBounds != null ? appBounds : getResolvedOverrideBounds();
+ final float contentW = contentBounds.width();
+ final float contentH = contentBounds.height();
+ final float viewportW = viewportBounds.width();
+ final float viewportH = viewportBounds.height();
+ // Only allow to scale down.
+ mSizeCompatScale = (contentW <= viewportW && contentH <= viewportH)
+ ? 1 : Math.min(viewportW / contentW, viewportH / contentH);
+ final int offsetX = (int) ((viewportW - contentW * mSizeCompatScale + 1) * 0.5f)
+ + viewportBounds.left;
+
+ if (mSizeCompatBounds == null) {
+ mSizeCompatBounds = new Rect();
+ }
+ mSizeCompatBounds.set(contentBounds);
+ mSizeCompatBounds.offsetTo(0, 0);
+ mSizeCompatBounds.scale(mSizeCompatScale);
+ // Ensure to align the top with the parent.
+ mSizeCompatBounds.top = parentBounds.top;
+ // The decor inset is included in height.
+ mSizeCompatBounds.bottom += viewportBounds.top;
+ mSizeCompatBounds.left += offsetX;
+ mSizeCompatBounds.right += offsetX;
+ }
+
+ @Override
public void onConfigurationChanged(Configuration newParentConfig) {
+ final int prevWinMode = getWindowingMode();
+ mTmpPrevBounds.set(getBounds());
super.onConfigurationChanged(newParentConfig);
+ final Task task = getTask();
+ final Rect overrideBounds = getResolvedOverrideBounds();
+ if (task != null && !overrideBounds.isEmpty()
+ // If the changes come from change-listener, the incoming parent configuration is
+ // still the old one. Make sure their orientations are the same to reduce computing
+ // the compatibility bounds for the intermediate state.
+ && (task.mTaskRecord == null || task.mTaskRecord
+ .getConfiguration().orientation == newParentConfig.orientation)) {
+ final Rect taskBounds = task.getBounds();
+ // Since we only center the activity horizontally, if only the fixed height is smaller
+ // than its container, the override bounds don't need to take effect.
+ if ((overrideBounds.width() != taskBounds.width()
+ || overrideBounds.height() > taskBounds.height())) {
+ calculateCompatBoundsTransformation(newParentConfig);
+ updateSurfacePosition();
+ } else if (mSizeCompatBounds != null) {
+ mSizeCompatBounds = null;
+ mSizeCompatScale = 1f;
+ updateSurfacePosition();
+ }
+ }
+
+ adjustPinnedStackAndInitChangeTransitionIfNeeded(prevWinMode, getWindowingMode());
+
// Configuration's equality doesn't consider seq so if only seq number changes in resolved
// override configuration. Therefore ConfigurationContainer doesn't change merged override
// configuration, but it's used to push configuration changes so explicitly update that.
@@ -3679,6 +6872,37 @@
}
}
+ private void adjustPinnedStackAndInitChangeTransitionIfNeeded(int prevWinMode, int winMode) {
+ if (prevWinMode == winMode || mDisplayContent == null) {
+ return;
+ }
+
+ if (prevWinMode == WINDOWING_MODE_PINNED && winMode != WINDOWING_MODE_UNDEFINED
+ && !isHidden()) {
+ // Leaving PiP to fullscreen, save the snap fraction based on the pre-animation bounds
+ // for the next re-entry into PiP (assuming the activity is not hidden or destroyed)
+ final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
+ if (pinnedStack != null) {
+ final Rect stackBounds;
+ if (pinnedStack.lastAnimatingBoundsWasToFullscreen()) {
+ // We are animating the bounds, use the pre-animation bounds to save the snap
+ // fraction
+ stackBounds = pinnedStack.mPreAnimationBounds;
+ } else {
+ // We skip the animation if the fullscreen configuration is not compatible, so
+ // use the current bounds to calculate the saved snap fraction instead
+ // (see PinnedActivityStack.skipResizeAnimation())
+ stackBounds = mTmpRect;
+ pinnedStack.getBounds(stackBounds);
+ }
+ mDisplayContent.mPinnedStackControllerLocked.saveReentrySnapFraction(
+ mActivityComponent, stackBounds);
+ }
+ } else if (shouldStartChangeTransition(prevWinMode, winMode)) {
+ initializeChangeTransition(mTmpPrevBounds);
+ }
+ }
+
/** Returns true if the configuration is compatible with this activity. */
boolean isConfigurationCompatible(Configuration config) {
final int orientation = getRequestedOrientation();
@@ -4344,14 +7568,13 @@
return info.applicationInfo.uid;
}
- @Override
int getPid() {
return app != null ? app.getPid() : 0;
}
/**
* Determines whether this ActivityRecord can turn the screen on. It checks whether the flag
- * {@link AppWindowToken#getTurnScreenOnFlag} is set and checks whether the ActivityRecord
+ * {@link ActivityRecord#getTurnScreenOnFlag} is set and checks whether the ActivityRecord
* should be visible depending on Keyguard state
*
* @return true if the screen can be turned on, false otherwise.
@@ -4365,6 +7588,14 @@
stack.checkKeyguardVisibility(this, true /* shouldBeVisible */, true /* isTop */);
}
+ void setTurnScreenOn(boolean turnScreenOn) {
+ mTurnScreenOn = turnScreenOn;
+ }
+
+ boolean getTurnScreenOnFlag() {
+ return mTurnScreenOn;
+ }
+
/**
* Check if this activity is able to resume. For pre-Q apps, only the topmost activities of each
* process are allowed to be resumed.
@@ -4431,7 +7662,7 @@
* {@code ActivityRecordProto} is the outer-most proto data.
*/
void writeToProto(ProtoOutputStream proto) {
- super.writeToProto(proto, APP_WINDOW_TOKEN, WindowTraceLogLevel.ALL);
+ writeToProto(proto, APP_WINDOW_TOKEN, WindowTraceLogLevel.ALL);
writeIdentifierToProto(proto, IDENTIFIER);
proto.write(STATE, mState.toString());
proto.write(VISIBLE, visible);
@@ -4449,6 +7680,65 @@
}
/**
+ * Copied from old AppWindowToken.
+ */
+ @Override
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ // Critical log level logs only visible elements to mitigate performance overheard
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
+ final long token = proto.start(fieldId);
+ writeNameToProto(proto, NAME);
+ super.writeToProto(proto, WINDOW_TOKEN, logLevel);
+ proto.write(LAST_SURFACE_SHOWING, mLastSurfaceShowing);
+ proto.write(IS_WAITING_FOR_TRANSITION_START, isWaitingForTransitionStart());
+ proto.write(IS_REALLY_ANIMATING, isReallyAnimating());
+ if (mThumbnail != null){
+ mThumbnail.writeToProto(proto, THUMBNAIL);
+ }
+ proto.write(FILLS_PARENT, mOccludesParent);
+ proto.write(APP_STOPPED, mAppStopped);
+ proto.write(HIDDEN_REQUESTED, hiddenRequested);
+ proto.write(CLIENT_HIDDEN, mClientHidden);
+ proto.write(DEFER_HIDING_CLIENT, mDeferHidingClient);
+ proto.write(REPORTED_DRAWN, reportedDrawn);
+ proto.write(REPORTED_VISIBLE, reportedVisible);
+ proto.write(NUM_INTERESTING_WINDOWS, mNumInterestingWindows);
+ proto.write(NUM_DRAWN_WINDOWS, mNumDrawnWindows);
+ proto.write(ALL_DRAWN, allDrawn);
+ proto.write(LAST_ALL_DRAWN, mLastAllDrawn);
+ proto.write(REMOVED, removed);
+ if (startingWindow != null) {
+ startingWindow.writeIdentifierToProto(proto, STARTING_WINDOW);
+ }
+ proto.write(STARTING_DISPLAYED, startingDisplayed);
+ proto.write(STARTING_MOVED, startingMoved);
+ proto.write(HIDDEN_SET_FROM_TRANSFERRED_STARTING_WINDOW,
+ mHiddenSetFromTransferredStartingWindow);
+ for (Rect bounds : mFrozenBounds) {
+ bounds.writeToProto(proto, FROZEN_BOUNDS);
+ }
+ proto.end(token);
+ }
+
+ void writeNameToProto(ProtoOutputStream proto, long fieldId) {
+ if (appToken != null) {
+ proto.write(fieldId, appToken.getName());
+ }
+ }
+
+ void writeIdentifierToProto(ProtoOutputStream proto, long fieldId) {
+ final long token = proto.start(fieldId);
+ proto.write(HASH_CODE, System.identityHashCode(this));
+ proto.write(USER_ID, mUserId);
+ proto.write(TITLE, intent.getComponent().flattenToShortString());
+ proto.end(token);
+ }
+
+ /**
* The precomputed insets of the display in each rotation. This is used to make the size
* compatibility mode activity compute the configuration without relying on its current display.
*/
@@ -4501,4 +7791,14 @@
isLandscape ? shortSide : longSide);
}
}
+
+ private static class AppSaturationInfo {
+ float[] mMatrix = new float[9];
+ float[] mTranslation = new float[3];
+
+ void setSaturation(@Size(9) float[] matrix, @Size(3) float[] translation) {
+ System.arraycopy(matrix, 0, mMatrix, 0, mMatrix.length);
+ System.arraycopy(translation, 0, mTranslation, 0, mTranslation.length);
+ }
+ }
}
diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index ca74196..9e7d767 100644
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -2254,7 +2254,7 @@
pw.print(" #"); pw.print(i); pw.print(": ");
pw.println(r);
if (full) {
- r.dump(pw, innerPrefix);
+ r.dump(pw, innerPrefix, true /* dumpAll */);
} else if (complete) {
// Complete + brief == give a summary. Isn't that obvious?!?
pw.print(innerPrefix); pw.println(r.intent.toInsecureString());
diff --git a/services/core/java/com/android/server/wm/ActivityStartController.java b/services/core/java/com/android/server/wm/ActivityStartController.java
index 6ee64f3..63cec1a 100644
--- a/services/core/java/com/android/server/wm/ActivityStartController.java
+++ b/services/core/java/com/android/server/wm/ActivityStartController.java
@@ -506,7 +506,7 @@
if (mLastHomeActivityStartRecord != null) {
pw.print(prefix);
pw.println("mLastHomeActivityStartRecord:");
- mLastHomeActivityStartRecord.dump(pw, prefix + " ");
+ mLastHomeActivityStartRecord.dump(pw, prefix + " ", true /* dumpAll */);
}
final boolean dumpPackagePresent = dumpPackage != null;
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index 1a80006..aee9c99 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2841,12 +2841,12 @@
if (r != null) {
pw.print(prefix);
pw.println("mLastStartActivityRecord:");
- r.dump(pw, prefix + " ");
+ r.dump(pw, prefix + " ", true /* dumpAll */);
}
if (mStartActivity != null) {
pw.print(prefix);
pw.println("mStartActivity:");
- mStartActivity.dump(pw, prefix + " ");
+ mStartActivity.dump(pw, prefix + " ", true /* dumpAll */);
}
if (mIntent != null) {
pw.print(prefix);
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 20113a6..e26e2f4 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -4984,7 +4984,7 @@
pw.println("(not running)");
}
if (dumpAll) {
- r.dump(pw, innerPrefix);
+ r.dump(pw, innerPrefix, true /* dumpAll */);
}
}
if (appThread != null) {
diff --git a/services/core/java/com/android/server/wm/AnimatingAppWindowTokenRegistry.java b/services/core/java/com/android/server/wm/AnimatingActivityRegistry.java
similarity index 72%
rename from services/core/java/com/android/server/wm/AnimatingAppWindowTokenRegistry.java
rename to services/core/java/com/android/server/wm/AnimatingActivityRegistry.java
index 9c00d1a..18ec96c 100644
--- a/services/core/java/com/android/server/wm/AnimatingAppWindowTokenRegistry.java
+++ b/services/core/java/com/android/server/wm/AnimatingActivityRegistry.java
@@ -23,55 +23,55 @@
import java.util.ArrayList;
/**
- * Keeps track of all {@link AppWindowToken} that are animating and makes sure all animations are
+ * Keeps track of all {@link ActivityRecord} that are animating and makes sure all animations are
* finished at the same time such that we don't run into issues with z-ordering: An activity A
* that has a shorter animation that is above another activity B with a longer animation in the same
* task, the animation layer would put the B on top of A, but from the hierarchy, A needs to be on
* top of B. Thus, we defer reparenting A to the original hierarchy such that it stays on top of B
* until B finishes animating.
*/
-class AnimatingAppWindowTokenRegistry {
+class AnimatingActivityRegistry {
- private ArraySet<AppWindowToken> mAnimatingTokens = new ArraySet<>();
- private ArrayMap<AppWindowToken, Runnable> mFinishedTokens = new ArrayMap<>();
+ private ArraySet<ActivityRecord> mAnimatingActivities = new ArraySet<>();
+ private ArrayMap<ActivityRecord, Runnable> mFinishedTokens = new ArrayMap<>();
private ArrayList<Runnable> mTmpRunnableList = new ArrayList<>();
private boolean mEndingDeferredFinish;
/**
- * Notifies that an {@link AppWindowToken} has started animating.
+ * Notifies that an {@link ActivityRecord} has started animating.
*/
- void notifyStarting(AppWindowToken token) {
- mAnimatingTokens.add(token);
+ void notifyStarting(ActivityRecord token) {
+ mAnimatingActivities.add(token);
}
/**
- * Notifies that an {@link AppWindowToken} has finished animating.
+ * Notifies that an {@link ActivityRecord} has finished animating.
*/
- void notifyFinished(AppWindowToken token) {
- mAnimatingTokens.remove(token);
- mFinishedTokens.remove(token);
+ void notifyFinished(ActivityRecord activity) {
+ mAnimatingActivities.remove(activity);
+ mFinishedTokens.remove(activity);
- // If we were the last token, make sure the end all deferred finishes.
- if (mAnimatingTokens.isEmpty()) {
+ // If we were the last activity, make sure the end all deferred finishes.
+ if (mAnimatingActivities.isEmpty()) {
endDeferringFinished();
}
}
/**
- * Called when an {@link AppWindowToken} is about to finish animating.
+ * Called when an {@link ActivityRecord} is about to finish animating.
*
* @param endDeferFinishCallback Callback to run when defer finish should be ended.
* @return {@code true} if finishing the animation should be deferred, {@code false} otherwise.
*/
- boolean notifyAboutToFinish(AppWindowToken token, Runnable endDeferFinishCallback) {
- final boolean removed = mAnimatingTokens.remove(token);
+ boolean notifyAboutToFinish(ActivityRecord activity, Runnable endDeferFinishCallback) {
+ final boolean removed = mAnimatingActivities.remove(activity);
if (!removed) {
return false;
}
- if (mAnimatingTokens.isEmpty()) {
+ if (mAnimatingActivities.isEmpty()) {
// If no animations are animating anymore, finish all others.
endDeferringFinished();
@@ -79,7 +79,7 @@
} else {
// Otherwise let's put it into the pending list of to be finished animations.
- mFinishedTokens.put(token, endDeferFinishCallback);
+ mFinishedTokens.put(activity, endDeferFinishCallback);
return true;
}
}
@@ -110,10 +110,10 @@
}
void dump(PrintWriter pw, String header, String prefix) {
- if (!mAnimatingTokens.isEmpty() || !mFinishedTokens.isEmpty()) {
+ if (!mAnimatingActivities.isEmpty() || !mFinishedTokens.isEmpty()) {
pw.print(prefix); pw.println(header);
prefix = prefix + " ";
- pw.print(prefix); pw.print("mAnimatingTokens="); pw.println(mAnimatingTokens);
+ pw.print(prefix); pw.print("mAnimatingActivities="); pw.println(mAnimatingActivities);
pw.print(prefix); pw.print("mFinishedTokens="); pw.println(mFinishedTokens);
}
}
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 394b475..c1143c8 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -338,8 +338,8 @@
updateBooster();
}
- void setLastAppTransition(int transit, AppWindowToken openingApp, AppWindowToken closingApp,
- AppWindowToken changingApp) {
+ void setLastAppTransition(int transit, ActivityRecord openingApp, ActivityRecord closingApp,
+ ActivityRecord changingApp) {
mLastUsedAppTransition = transit;
mLastOpeningApp = "" + openingApp;
mLastClosingApp = "" + closingApp;
@@ -430,7 +430,7 @@
* @return bit-map of WindowManagerPolicy#FINISH_LAYOUT_REDO_* to indicate whether another
* layout pass needs to be done
*/
- int goodToGo(int transit, AppWindowToken topOpeningApp, ArraySet<AppWindowToken> openingApps) {
+ int goodToGo(int transit, ActivityRecord topOpeningApp, ArraySet<ActivityRecord> openingApps) {
mNextAppTransition = TRANSIT_UNSET;
mNextAppTransitionFlags = 0;
setAppTransitionState(APP_STATE_RUNNING);
diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java
index 0c07e15..3bda0c2 100644
--- a/services/core/java/com/android/server/wm/AppTransitionController.java
+++ b/services/core/java/com/android/server/wm/AppTransitionController.java
@@ -156,20 +156,20 @@
final ArraySet<Integer> activityTypes = collectActivityTypes(mDisplayContent.mOpeningApps,
mDisplayContent.mClosingApps, mDisplayContent.mChangingApps);
final boolean allowAnimations = mDisplayContent.getDisplayPolicy().allowAppAnimationsLw();
- final AppWindowToken animLpToken = allowAnimations
+ final ActivityRecord animLpActivity = allowAnimations
? findAnimLayoutParamsToken(transit, activityTypes)
: null;
- final AppWindowToken topOpeningApp = allowAnimations
+ final ActivityRecord topOpeningApp = allowAnimations
? getTopApp(mDisplayContent.mOpeningApps, false /* ignoreHidden */)
: null;
- final AppWindowToken topClosingApp = allowAnimations
+ final ActivityRecord topClosingApp = allowAnimations
? getTopApp(mDisplayContent.mClosingApps, false /* ignoreHidden */)
: null;
- final AppWindowToken topChangingApp = allowAnimations
+ final ActivityRecord topChangingApp = allowAnimations
? getTopApp(mDisplayContent.mChangingApps, false /* ignoreHidden */)
: null;
- final WindowManager.LayoutParams animLp = getAnimLp(animLpToken);
- overrideWithRemoteAnimationIfSet(animLpToken, transit, activityTypes);
+ final WindowManager.LayoutParams animLp = getAnimLp(animLpActivity);
+ overrideWithRemoteAnimationIfSet(animLpActivity, transit, activityTypes);
final boolean voiceInteraction = containsVoiceInteraction(mDisplayContent.mOpeningApps)
|| containsVoiceInteraction(mDisplayContent.mOpeningApps)
@@ -223,14 +223,14 @@
layoutRedo | FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_CONFIG;
}
- private static WindowManager.LayoutParams getAnimLp(AppWindowToken wtoken) {
- final WindowState mainWindow = wtoken != null ? wtoken.findMainWindow() : null;
+ private static WindowManager.LayoutParams getAnimLp(ActivityRecord activity) {
+ final WindowState mainWindow = activity != null ? activity.findMainWindow() : null;
return mainWindow != null ? mainWindow.mAttrs : null;
}
- RemoteAnimationAdapter getRemoteAnimationOverride(AppWindowToken animLpToken, int transit,
+ RemoteAnimationAdapter getRemoteAnimationOverride(ActivityRecord animLpActivity, int transit,
ArraySet<Integer> activityTypes) {
- final RemoteAnimationDefinition definition = animLpToken.getRemoteAnimationDefinition();
+ final RemoteAnimationDefinition definition = animLpActivity.getRemoteAnimationDefinition();
if (definition != null) {
final RemoteAnimationAdapter adapter = definition.getAdapter(transit, activityTypes);
if (adapter != null) {
@@ -247,19 +247,19 @@
* Overrides the pending transition with the remote animation defined for the transition in the
* set of defined remote animations in the app window token.
*/
- private void overrideWithRemoteAnimationIfSet(AppWindowToken animLpToken, int transit,
+ private void overrideWithRemoteAnimationIfSet(ActivityRecord animLpActivity, int transit,
ArraySet<Integer> activityTypes) {
if (transit == TRANSIT_CRASHING_ACTIVITY_CLOSE) {
// The crash transition has higher priority than any involved remote animations.
return;
}
- if (animLpToken == null) {
+ if (animLpActivity == null) {
return;
}
final RemoteAnimationAdapter adapter =
- getRemoteAnimationOverride(animLpToken, transit, activityTypes);
+ getRemoteAnimationOverride(animLpActivity, transit, activityTypes);
if (adapter != null) {
- animLpToken.getDisplayContent().mAppTransition.overridePendingAppTransitionRemote(
+ animLpActivity.getDisplayContent().mAppTransition.overridePendingAppTransitionRemote(
adapter);
}
}
@@ -267,12 +267,12 @@
/**
* @return The window token that determines the animation theme.
*/
- private AppWindowToken findAnimLayoutParamsToken(@WindowManager.TransitionType int transit,
+ private ActivityRecord findAnimLayoutParamsToken(@WindowManager.TransitionType int transit,
ArraySet<Integer> activityTypes) {
- AppWindowToken result;
- final ArraySet<AppWindowToken> closingApps = mDisplayContent.mClosingApps;
- final ArraySet<AppWindowToken> openingApps = mDisplayContent.mOpeningApps;
- final ArraySet<AppWindowToken> changingApps = mDisplayContent.mChangingApps;
+ ActivityRecord result;
+ final ArraySet<ActivityRecord> closingApps = mDisplayContent.mClosingApps;
+ final ArraySet<ActivityRecord> openingApps = mDisplayContent.mOpeningApps;
+ final ArraySet<ActivityRecord> changingApps = mDisplayContent.mChangingApps;
// Remote animations always win, but fullscreen tokens override non-fullscreen tokens.
result = lookForHighestTokenWithFilter(closingApps, openingApps, changingApps,
@@ -294,8 +294,8 @@
* @return The set of {@link android.app.WindowConfiguration.ActivityType}s contained in the set
* of apps in {@code array1}, {@code array2}, and {@code array3}.
*/
- private static ArraySet<Integer> collectActivityTypes(ArraySet<AppWindowToken> array1,
- ArraySet<AppWindowToken> array2, ArraySet<AppWindowToken> array3) {
+ private static ArraySet<Integer> collectActivityTypes(ArraySet<ActivityRecord> array1,
+ ArraySet<ActivityRecord> array2, ArraySet<ActivityRecord> array3) {
final ArraySet<Integer> result = new ArraySet<>();
for (int i = array1.size() - 1; i >= 0; i--) {
result.add(array1.valueAt(i).getActivityType());
@@ -309,16 +309,16 @@
return result;
}
- private static AppWindowToken lookForHighestTokenWithFilter(ArraySet<AppWindowToken> array1,
- ArraySet<AppWindowToken> array2, ArraySet<AppWindowToken> array3,
- Predicate<AppWindowToken> filter) {
+ private static ActivityRecord lookForHighestTokenWithFilter(ArraySet<ActivityRecord> array1,
+ ArraySet<ActivityRecord> array2, ArraySet<ActivityRecord> array3,
+ Predicate<ActivityRecord> filter) {
final int array2base = array1.size();
final int array3base = array2.size() + array2base;
final int count = array3base + array3.size();
int bestPrefixOrderIndex = Integer.MIN_VALUE;
- AppWindowToken bestToken = null;
+ ActivityRecord bestToken = null;
for (int i = 0; i < count; i++) {
- final AppWindowToken wtoken = i < array2base
+ final ActivityRecord wtoken = i < array2base
? array1.valueAt(i)
: (i < array3base
? array2.valueAt(i - array2base)
@@ -332,7 +332,7 @@
return bestToken;
}
- private boolean containsVoiceInteraction(ArraySet<AppWindowToken> apps) {
+ private boolean containsVoiceInteraction(ArraySet<ActivityRecord> apps) {
for (int i = apps.size() - 1; i >= 0; i--) {
if (apps.valueAt(i).mVoiceInteraction) {
return true;
@@ -342,10 +342,10 @@
}
private void handleOpeningApps(int transit, LayoutParams animLp, boolean voiceInteraction) {
- final ArraySet<AppWindowToken> openingApps = mDisplayContent.mOpeningApps;
+ final ArraySet<ActivityRecord> openingApps = mDisplayContent.mOpeningApps;
final int appsCount = openingApps.size();
for (int i = 0; i < appsCount; i++) {
- AppWindowToken wtoken = openingApps.valueAt(i);
+ ActivityRecord wtoken = openingApps.valueAt(i);
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Now opening app %s", wtoken);
if (!wtoken.commitVisibility(animLp, true, transit, false, voiceInteraction)) {
@@ -376,10 +376,10 @@
}
private void handleClosingApps(int transit, LayoutParams animLp, boolean voiceInteraction) {
- final ArraySet<AppWindowToken> closingApps = mDisplayContent.mClosingApps;
+ final ArraySet<ActivityRecord> closingApps = mDisplayContent.mClosingApps;
final int appsCount = closingApps.size();
for (int i = 0; i < appsCount; i++) {
- AppWindowToken wtoken = closingApps.valueAt(i);
+ ActivityRecord wtoken = closingApps.valueAt(i);
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Now closing app %s", wtoken);
// TODO: Do we need to add to mNoAnimationNotifyOnTransitionFinished like above if not
@@ -404,17 +404,17 @@
}
private void handleChangingApps(int transit, LayoutParams animLp, boolean voiceInteraction) {
- final ArraySet<AppWindowToken> apps = mDisplayContent.mChangingApps;
+ final ArraySet<ActivityRecord> apps = mDisplayContent.mChangingApps;
final int appsCount = apps.size();
for (int i = 0; i < appsCount; i++) {
- AppWindowToken wtoken = apps.valueAt(i);
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Now changing app %s", wtoken);
- wtoken.cancelAnimationOnly();
- wtoken.applyAnimationLocked(null, transit, true, false);
- wtoken.updateReportedVisibilityLocked();
+ ActivityRecord activity = apps.valueAt(i);
+ ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Now changing app %s", activity);
+ activity.cancelAnimationOnly();
+ activity.applyAnimationLocked(null, transit, true, false);
+ activity.updateReportedVisibilityLocked();
mService.openSurfaceTransaction();
try {
- wtoken.showAllWindowsLocked();
+ activity.showAllWindowsLocked();
} finally {
mService.closeSurfaceTransaction("handleChangingApps");
}
@@ -442,7 +442,7 @@
}
}
- private boolean transitionGoodToGo(ArraySet<AppWindowToken> apps, SparseIntArray outReasons) {
+ private boolean transitionGoodToGo(ArraySet<ActivityRecord> apps, SparseIntArray outReasons) {
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
"Checking %d opening apps (frozen=%b timeout=%b)...", apps.size(),
mService.mDisplayFrozen, mDisplayContent.mAppTransition.isTimeout());
@@ -465,25 +465,25 @@
return false;
}
for (int i = 0; i < apps.size(); i++) {
- AppWindowToken wtoken = apps.valueAt(i);
+ ActivityRecord activity = apps.valueAt(i);
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
"Check opening app=%s: allDrawn=%b startingDisplayed=%b "
+ "startingMoved=%b isRelaunching()=%b startingWindow=%s",
- wtoken, wtoken.allDrawn, wtoken.startingDisplayed,
- wtoken.startingMoved, wtoken.isRelaunching(),
- wtoken.startingWindow);
+ activity, activity.allDrawn, activity.startingDisplayed,
+ activity.startingMoved, activity.isRelaunching(),
+ activity.startingWindow);
- final boolean allDrawn = wtoken.allDrawn && !wtoken.isRelaunching();
- if (!allDrawn && !wtoken.startingDisplayed && !wtoken.startingMoved) {
+ final boolean allDrawn = activity.allDrawn && !activity.isRelaunching();
+ if (!allDrawn && !activity.startingDisplayed && !activity.startingMoved) {
return false;
}
- final int windowingMode = wtoken.getWindowingMode();
+ final int windowingMode = activity.getWindowingMode();
if (allDrawn) {
outReasons.put(windowingMode, APP_TRANSITION_WINDOWS_DRAWN);
} else {
outReasons.put(windowingMode,
- wtoken.mStartingData instanceof SplashScreenStartingData
+ activity.mStartingData instanceof SplashScreenStartingData
? APP_TRANSITION_SPLASH_SCREEN
: APP_TRANSITION_SNAPSHOT);
}
@@ -534,11 +534,11 @@
(mWallpaperControllerLocked.isWallpaperTargetAnimating() || !showWallpaper)
? null
: wallpaperTarget;
- final ArraySet<AppWindowToken> openingApps = mDisplayContent.mOpeningApps;
- final ArraySet<AppWindowToken> closingApps = mDisplayContent.mClosingApps;
- final AppWindowToken topOpeningApp = getTopApp(mDisplayContent.mOpeningApps,
+ final ArraySet<ActivityRecord> openingApps = mDisplayContent.mOpeningApps;
+ final ArraySet<ActivityRecord> closingApps = mDisplayContent.mClosingApps;
+ final ActivityRecord topOpeningApp = getTopApp(mDisplayContent.mOpeningApps,
false /* ignoreHidden */);
- final AppWindowToken topClosingApp = getTopApp(mDisplayContent.mClosingApps,
+ final ActivityRecord topClosingApp = getTopApp(mDisplayContent.mClosingApps,
true /* ignoreHidden */);
boolean openingCanBeWallpaperTarget = canBeWallpaperTarget(openingApps);
@@ -571,17 +571,17 @@
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
"New transit: %s", AppTransition.appTransitionToString(transit));
} else if (oldWallpaper != null && !mDisplayContent.mOpeningApps.isEmpty()
- && !openingApps.contains(oldWallpaper.mAppToken)
- && closingApps.contains(oldWallpaper.mAppToken)
- && topClosingApp == oldWallpaper.mAppToken) {
+ && !openingApps.contains(oldWallpaper.mActivityRecord)
+ && closingApps.contains(oldWallpaper.mActivityRecord)
+ && topClosingApp == oldWallpaper.mActivityRecord) {
// We are transitioning from an activity with a wallpaper to one without.
transit = TRANSIT_WALLPAPER_CLOSE;
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
"New transit away from wallpaper: %s",
AppTransition.appTransitionToString(transit));
} else if (wallpaperTarget != null && wallpaperTarget.isVisibleLw()
- && openingApps.contains(wallpaperTarget.mAppToken)
- && topOpeningApp == wallpaperTarget.mAppToken
+ && openingApps.contains(wallpaperTarget.mActivityRecord)
+ && topOpeningApp == wallpaperTarget.mActivityRecord
&& transit != TRANSIT_TRANSLUCENT_ACTIVITY_CLOSE) {
// We are transitioning from an activity without
// a wallpaper to now showing the wallpaper
@@ -616,10 +616,10 @@
boolean allOpeningVisible = true;
boolean allTranslucentOpeningApps = !mDisplayContent.mOpeningApps.isEmpty();
for (int i = mDisplayContent.mOpeningApps.size() - 1; i >= 0; i--) {
- final AppWindowToken token = mDisplayContent.mOpeningApps.valueAt(i);
- if (!token.isVisible()) {
+ final ActivityRecord activity = mDisplayContent.mOpeningApps.valueAt(i);
+ if (!activity.isVisible()) {
allOpeningVisible = false;
- if (token.fillsParent()) {
+ if (activity.fillsParent()) {
allTranslucentOpeningApps = false;
}
}
@@ -660,13 +660,13 @@
return false;
}
// check that all components are in the task.
- for (AppWindowToken activity : mDisplayContent.mOpeningApps) {
+ for (ActivityRecord activity : mDisplayContent.mOpeningApps) {
Task activityTask = activity.getTask();
if (activityTask != task) {
return false;
}
}
- for (AppWindowToken activity : mDisplayContent.mClosingApps) {
+ for (ActivityRecord activity : mDisplayContent.mClosingApps) {
if (activity.getTask() != task) {
return false;
}
@@ -674,7 +674,7 @@
return true;
}
- private boolean canBeWallpaperTarget(ArraySet<AppWindowToken> apps) {
+ private boolean canBeWallpaperTarget(ArraySet<ActivityRecord> apps) {
for (int i = apps.size() - 1; i >= 0; i--) {
if (apps.valueAt(i).windowsCanBeWallpaperTarget()) {
return true;
@@ -684,18 +684,18 @@
}
/**
- * Finds the top app in a list of apps, using its {@link AppWindowToken#getPrefixOrderIndex} to
+ * Finds the top app in a list of apps, using its {@link ActivityRecord#getPrefixOrderIndex} to
* compare z-order.
*
* @param apps The list of apps to search.
- * @param ignoreHidden If set to true, ignores apps that are {@link AppWindowToken#isHidden}.
- * @return The top {@link AppWindowToken}.
+ * @param ignoreHidden If set to true, ignores apps that are {@link ActivityRecord#isHidden}.
+ * @return The top {@link ActivityRecord}.
*/
- private AppWindowToken getTopApp(ArraySet<AppWindowToken> apps, boolean ignoreHidden) {
+ private ActivityRecord getTopApp(ArraySet<ActivityRecord> apps, boolean ignoreHidden) {
int topPrefixOrderIndex = Integer.MIN_VALUE;
- AppWindowToken topApp = null;
+ ActivityRecord topApp = null;
for (int i = apps.size() - 1; i >= 0; i--) {
- final AppWindowToken app = apps.valueAt(i);
+ final ActivityRecord app = apps.valueAt(i);
if (ignoreHidden && app.isHidden()) {
continue;
}
diff --git a/services/core/java/com/android/server/wm/AppWindowThumbnail.java b/services/core/java/com/android/server/wm/AppWindowThumbnail.java
index 2b05024..acd96e9 100644
--- a/services/core/java/com/android/server/wm/AppWindowThumbnail.java
+++ b/services/core/java/com/android/server/wm/AppWindowThumbnail.java
@@ -44,39 +44,39 @@
import java.util.function.Supplier;
/**
- * Represents a surface that is displayed over an {@link AppWindowToken}
+ * Represents a surface that is displayed over an {@link ActivityRecord}
*/
class AppWindowThumbnail implements Animatable {
private static final String TAG = TAG_WITH_CLASS_NAME ? "AppWindowThumbnail" : TAG_WM;
- private final AppWindowToken mAppToken;
+ private final ActivityRecord mActivityRecord;
private SurfaceControl mSurfaceControl;
private final SurfaceAnimator mSurfaceAnimator;
private final int mWidth;
private final int mHeight;
private final boolean mRelative;
- AppWindowThumbnail(Supplier<Surface> surfaceFactory, Transaction t, AppWindowToken appToken,
+ AppWindowThumbnail(Supplier<Surface> surfaceFactory, Transaction t, ActivityRecord activity,
GraphicBuffer thumbnailHeader) {
- this(surfaceFactory, t, appToken, thumbnailHeader, false /* relative */);
+ this(surfaceFactory, t, activity, thumbnailHeader, false /* relative */);
}
/**
* @param t Transaction to create the thumbnail in.
- * @param appToken {@link AppWindowToken} to associate this thumbnail with.
+ * @param activity {@link ActivityRecord} to associate this thumbnail with.
* @param thumbnailHeader A thumbnail or placeholder for thumbnail to initialize with.
- * @param relative Whether this thumbnail will be a child of appToken (and thus positioned
+ * @param relative Whether this thumbnail will be a child of activity (and thus positioned
* relative to it) or not.
*/
- AppWindowThumbnail(Supplier<Surface> surfaceFactory, Transaction t, AppWindowToken appToken,
+ AppWindowThumbnail(Supplier<Surface> surfaceFactory, Transaction t, ActivityRecord activity,
GraphicBuffer thumbnailHeader, boolean relative) {
- this(t, appToken, thumbnailHeader, relative, surfaceFactory.get(), null);
+ this(t, activity, thumbnailHeader, relative, surfaceFactory.get(), null);
}
- AppWindowThumbnail(Transaction t, AppWindowToken appToken, GraphicBuffer thumbnailHeader,
+ AppWindowThumbnail(Transaction t, ActivityRecord activity, GraphicBuffer thumbnailHeader,
boolean relative, Surface drawSurface, SurfaceAnimator animator) {
- mAppToken = appToken;
+ mActivityRecord = activity;
mRelative = relative;
if (animator != null) {
mSurfaceAnimator = animator;
@@ -84,22 +84,22 @@
// We can't use a delegating constructor since we need to
// reference this::onAnimationFinished
mSurfaceAnimator =
- new SurfaceAnimator(this, this::onAnimationFinished, appToken.mWmService);
+ new SurfaceAnimator(this, this::onAnimationFinished, activity.mWmService);
}
mWidth = thumbnailHeader.getWidth();
mHeight = thumbnailHeader.getHeight();
// Create a new surface for the thumbnail
- WindowState window = appToken.findMainWindow();
+ WindowState window = mActivityRecord.findMainWindow();
// TODO: This should be attached as a child to the app token, once the thumbnail animations
// use relative coordinates. Once we start animating task we can also consider attaching
// this to the task.
- mSurfaceControl = appToken.makeSurface()
- .setName("thumbnail anim: " + appToken.toString())
+ mSurfaceControl = mActivityRecord.makeSurface()
+ .setName("thumbnail anim: " + mActivityRecord.toString())
.setBufferSize(mWidth, mHeight)
.setFormat(PixelFormat.TRANSLUCENT)
- .setMetadata(METADATA_WINDOW_TYPE, appToken.windowType)
+ .setMetadata(METADATA_WINDOW_TYPE, mActivityRecord.windowType)
.setMetadata(METADATA_OWNER_UID,
window != null ? window.mOwnerUid : Binder.getCallingUid())
.build();
@@ -116,7 +116,7 @@
// task.
t.setLayer(mSurfaceControl, Integer.MAX_VALUE);
if (relative) {
- t.reparent(mSurfaceControl, appToken.getSurfaceControl());
+ t.reparent(mSurfaceControl, mActivityRecord.getSurfaceControl());
}
}
@@ -126,12 +126,12 @@
void startAnimation(Transaction t, Animation anim, Point position) {
anim.restrictDuration(MAX_ANIMATION_DURATION);
- anim.scaleCurrentDuration(mAppToken.mWmService.getTransitionAnimationScaleLocked());
+ anim.scaleCurrentDuration(mActivityRecord.mWmService.getTransitionAnimationScaleLocked());
mSurfaceAnimator.startAnimation(t, new LocalAnimationAdapter(
new WindowAnimationSpec(anim, position,
- mAppToken.getDisplayContent().mAppTransition.canSkipFirstFrame(),
- mAppToken.getDisplayContent().getWindowCornerRadius()),
- mAppToken.mWmService.mSurfaceAnimationRunner), false /* hidden */);
+ mActivityRecord.getDisplayContent().mAppTransition.canSkipFirstFrame(),
+ mActivityRecord.getDisplayContent().getWindowCornerRadius()),
+ mActivityRecord.mWmService.mSurfaceAnimationRunner), false /* hidden */);
}
/**
@@ -179,19 +179,19 @@
@Override
public Transaction getPendingTransaction() {
- return mAppToken.getPendingTransaction();
+ return mActivityRecord.getPendingTransaction();
}
@Override
public void commitPendingTransaction() {
- mAppToken.commitPendingTransaction();
+ mActivityRecord.commitPendingTransaction();
}
@Override
public void onAnimationLeashCreated(Transaction t, SurfaceControl leash) {
t.setLayer(leash, Integer.MAX_VALUE);
if (mRelative) {
- t.reparent(leash, mAppToken.getSurfaceControl());
+ t.reparent(leash, mActivityRecord.getSurfaceControl());
}
}
@@ -205,7 +205,7 @@
@Override
public Builder makeAnimationLeash() {
- return mAppToken.makeSurface();
+ return mActivityRecord.makeSurface();
}
@Override
@@ -215,12 +215,12 @@
@Override
public SurfaceControl getAnimationLeashParent() {
- return mAppToken.getAppAnimationLayer();
+ return mActivityRecord.getAppAnimationLayer();
}
@Override
public SurfaceControl getParentSurfaceControl() {
- return mAppToken.getParentSurfaceControl();
+ return mActivityRecord.getParentSurfaceControl();
}
@Override
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
deleted file mode 100644
index e56fdd2..0000000
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ /dev/null
@@ -1,3448 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.wm;
-
-import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
-import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
-import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
-import static android.content.pm.ActivityInfo.COLOR_MODE_DEFAULT;
-import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
-import static android.content.pm.ActivityInfo.FLAG_INHERIT_SHOW_WHEN_LOCKED;
-import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;
-import static android.content.pm.ActivityInfo.FLAG_TURN_SCREEN_ON;
-import static android.content.pm.ActivityInfo.LAUNCH_MULTIPLE;
-import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TOP;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
-import static android.os.Build.VERSION_CODES.HONEYCOMB;
-import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
-import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
-import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
-import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
-import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
-import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
-import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;
-import static android.view.WindowManager.TRANSIT_TASK_CHANGE_WINDOWING_MODE;
-import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND;
-import static android.view.WindowManager.TRANSIT_UNSET;
-import static android.view.WindowManager.TRANSIT_WALLPAPER_OPEN;
-
-import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM;
-import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
-import static com.android.server.wm.AppWindowTokenProto.ALL_DRAWN;
-import static com.android.server.wm.AppWindowTokenProto.APP_STOPPED;
-import static com.android.server.wm.AppWindowTokenProto.CLIENT_HIDDEN;
-import static com.android.server.wm.AppWindowTokenProto.DEFER_HIDING_CLIENT;
-import static com.android.server.wm.AppWindowTokenProto.FILLS_PARENT;
-import static com.android.server.wm.AppWindowTokenProto.FROZEN_BOUNDS;
-import static com.android.server.wm.AppWindowTokenProto.HIDDEN_REQUESTED;
-import static com.android.server.wm.AppWindowTokenProto.HIDDEN_SET_FROM_TRANSFERRED_STARTING_WINDOW;
-import static com.android.server.wm.AppWindowTokenProto.IS_REALLY_ANIMATING;
-import static com.android.server.wm.AppWindowTokenProto.IS_WAITING_FOR_TRANSITION_START;
-import static com.android.server.wm.AppWindowTokenProto.LAST_ALL_DRAWN;
-import static com.android.server.wm.AppWindowTokenProto.LAST_SURFACE_SHOWING;
-import static com.android.server.wm.AppWindowTokenProto.NAME;
-import static com.android.server.wm.AppWindowTokenProto.NUM_DRAWN_WINDOWS;
-import static com.android.server.wm.AppWindowTokenProto.NUM_INTERESTING_WINDOWS;
-import static com.android.server.wm.AppWindowTokenProto.REMOVED;
-import static com.android.server.wm.AppWindowTokenProto.REPORTED_DRAWN;
-import static com.android.server.wm.AppWindowTokenProto.REPORTED_VISIBLE;
-import static com.android.server.wm.AppWindowTokenProto.STARTING_DISPLAYED;
-import static com.android.server.wm.AppWindowTokenProto.STARTING_MOVED;
-import static com.android.server.wm.AppWindowTokenProto.STARTING_WINDOW;
-import static com.android.server.wm.AppWindowTokenProto.THUMBNAIL;
-import static com.android.server.wm.AppWindowTokenProto.WINDOW_TOKEN;
-import static com.android.server.wm.IdentifierProto.HASH_CODE;
-import static com.android.server.wm.IdentifierProto.TITLE;
-import static com.android.server.wm.IdentifierProto.USER_ID;
-import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ADD_REMOVE;
-import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS;
-import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS_ANIM;
-import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_FOCUS_LIGHT;
-import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION;
-import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_STARTING_WINDOW;
-import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
-import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;
-import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW_VERBOSE;
-import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY;
-import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
-import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
-import static com.android.server.wm.WindowManagerService.H.NOTIFY_ACTIVITY_DRAWN;
-import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
-import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;
-import static com.android.server.wm.WindowManagerService.logWithStack;
-import static com.android.server.wm.WindowState.LEGACY_POLICY_VISIBILITY;
-import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN;
-import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM;
-import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM;
-
-import android.annotation.CallSuper;
-import android.annotation.Nullable;
-import android.annotation.Size;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityOptions;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.CompatibilityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.GraphicBuffer;
-import android.graphics.PixelFormat;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.os.Binder;
-import android.os.Build;
-import android.os.Debug;
-import android.os.IBinder;
-import android.os.SystemClock;
-import android.os.Trace;
-import android.os.UserHandle;
-import android.util.ArraySet;
-import android.util.Slog;
-import android.util.proto.ProtoOutputStream;
-import android.view.DisplayInfo;
-import android.view.InputApplicationHandle;
-import android.view.RemoteAnimationAdapter;
-import android.view.RemoteAnimationDefinition;
-import android.view.SurfaceControl;
-import android.view.SurfaceControl.Transaction;
-import android.view.WindowManager;
-import android.view.WindowManager.LayoutParams;
-import android.view.animation.Animation;
-
-import com.android.internal.R;
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.util.ToBooleanFunction;
-import com.android.server.AttributeCache;
-import com.android.server.LocalServices;
-import com.android.server.display.color.ColorDisplayService;
-import com.android.server.policy.WindowManagerPolicy;
-import com.android.server.policy.WindowManagerPolicy.StartingSurface;
-import com.android.server.protolog.common.ProtoLog;
-import com.android.server.wm.RemoteAnimationController.RemoteAnimationRecord;
-import com.android.server.wm.WindowManagerService.H;
-
-import java.io.PrintWriter;
-import java.lang.ref.WeakReference;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.function.Consumer;
-
-class AppTokenList extends ArrayList<AppWindowToken> {
-}
-
-/**
- * Version of WindowToken that is specifically for a particular application (or
- * really activity) that is displaying windows.
- */
-// TODO: Fully merge this class into ActivityRecord class since they are really the same thing...
-class AppWindowToken extends WindowToken implements WindowManagerService.AppFreezeListener {
- private static final String TAG = TAG_WITH_CLASS_NAME ? "AppWindowToken" : TAG_WM;
-
- /**
- * Value to increment the z-layer when boosting a layer during animations. BOOST in l33tsp34k.
- */
- @VisibleForTesting static final int Z_BOOST_BASE = 800570000;
-
- final ActivityTaskManagerService mAtmService;
- // Non-null only for application tokens.
- // TODO: rename to mActivityToken
- final ActivityRecord.Token appToken;
- // All about me
- final ActivityInfo mActivityInfo;
- // Which user is this running for?
- final int mUserId;
- // The package implementing intent's component
- // TODO: rename to mPackageName
- final String packageName;
- // the intent component, or target of an alias.
- final ComponentName mActivityComponent;
- boolean mVoiceInteraction;
-
- /**
- * The activity is opaque and fills the entire space of this task.
- * @see WindowContainer#fillsParent()
- */
- private boolean mOccludesParent;
- // Has a wallpaper window as a background.
- // TODO: Rename to mHasWallpaper and also see if it possible to combine this with the
- // mOccludesParent field.
- final boolean hasWallpaper;
- // activity is not displayed?
- // TODO: rename to mNoDisplay
- @VisibleForTesting
- boolean noDisplay;
- boolean mShowForAllUsers;
- // TODO: Make this final
- int mTargetSdk;
-
- // Flag set while reparenting to prevent actions normally triggered by an individual parent
- // change.
- private boolean mReparenting;
-
- // True if we are current in the process of removing this app token from the display
- private boolean mRemovingFromDisplay = false;
-
- // The input dispatching timeout for this application token in nanoseconds.
- long mInputDispatchingTimeoutNanos;
-
- // These are used for determining when all windows associated with
- // an activity have been drawn, so they can be made visible together
- // at the same time.
- // initialize so that it doesn't match mTransactionSequence which is an int.
- private long mLastTransactionSequence = Long.MIN_VALUE;
- private int mNumInterestingWindows;
- private int mNumDrawnWindows;
- boolean inPendingTransaction;
- boolean allDrawn;
- private boolean mLastAllDrawn;
- private boolean mUseTransferredAnimation;
-
- // Set to true when this app creates a surface while in the middle of an animation. In that
- // case do not clear allDrawn until the animation completes.
- boolean deferClearAllDrawn;
-
- // Is this window's surface needed? This is almost like hidden, except
- // it will sometimes be true a little earlier: when the token has
- // been shown, but is still waiting for its app transition to execute
- // before making its windows shown.
- boolean hiddenRequested;
-
- // Have we told the window clients to hide themselves?
- private boolean mClientHidden;
-
- // If true we will defer setting mClientHidden to true and reporting to the client that it is
- // hidden.
- boolean mDeferHidingClient;
-
- // Last visibility state we reported to the app token.
- boolean reportedVisible;
-
- // Last drawn state we reported to the app token.
- private boolean reportedDrawn;
-
- // Set to true when the token has been removed from the window mgr.
- boolean removed;
-
- // Information about an application starting window if displayed.
- // Note: these are de-referenced before the starting window animates away.
- StartingData mStartingData;
- WindowState startingWindow;
- StartingSurface startingSurface;
- boolean startingDisplayed;
- boolean startingMoved;
-
- // True if the hidden state of this token was forced to false due to a transferred starting
- // window.
- private boolean mHiddenSetFromTransferredStartingWindow;
- boolean firstWindowDrawn;
- private final WindowState.UpdateReportedVisibilityResults mReportedVisibilityResults =
- new WindowState.UpdateReportedVisibilityResults();
-
- // Input application handle used by the input dispatcher.
- final InputApplicationHandle mInputApplicationHandle;
-
- // TODO: Have a WindowContainer state for tracking exiting/deferred removal.
- boolean mIsExiting;
-
- boolean mLaunchTaskBehind;
- boolean mEnteringAnimation;
-
- boolean mAppStopped;
- // A hint to override the window specified rotation animation, or -1 to use the window specified
- // value. We use this so that we can select the right animation in the cases of starting
- // windows, where the app hasn't had time to set a value on the window.
- int mRotationAnimationHint = -1;
-
- private int mPendingRelaunchCount;
-
- private boolean mLastContainsShowWhenLockedWindow;
- private boolean mLastContainsDismissKeyguardWindow;
-
- ArrayDeque<Rect> mFrozenBounds = new ArrayDeque<>();
- ArrayDeque<Configuration> mFrozenMergedConfig = new ArrayDeque<>();
-
- /**
- * The scale to fit at least one side of the activity to its parent. If the activity uses
- * 1920x1080, and the actually size on the screen is 960x540, then the scale is 0.5.
- */
- private float mSizeCompatScale = 1f;
- /**
- * The bounds in global coordinates for activity in size compatibility mode.
- * @see ActivityRecord#inSizeCompatMode
- */
- private Rect mSizeCompatBounds;
-
- private boolean mDisablePreviewScreenshots;
-
- private Task mLastParent;
-
- /**
- * @see #currentLaunchCanTurnScreenOn()
- */
- private boolean mCurrentLaunchCanTurnScreenOn = true;
-
- /**
- * If we are running an animation, this determines the transition type. Must be one of
- * AppTransition.TRANSIT_* constants.
- */
- private int mTransit;
-
- /**
- * If we are running an animation, this determines the flags during this animation. Must be a
- * bitwise combination of AppTransition.TRANSIT_FLAG_* constants.
- */
- private int mTransitFlags;
-
- /** Whether our surface was set to be showing in the last call to {@link #prepareSurfaces} */
- private boolean mLastSurfaceShowing = true;
-
- /**
- * This gets used during some open/close transitions as well as during a change transition
- * where it represents the starting-state snapshot.
- */
- private AppWindowThumbnail mThumbnail;
- private final Rect mTransitStartRect = new Rect();
-
- /**
- * This leash is used to "freeze" the app surface in place after the state change, but before
- * the animation is ready to start.
- */
- private SurfaceControl mTransitChangeLeash = null;
-
- /** Have we been asked to have this token keep the screen frozen? */
- private boolean mFreezingScreen;
-
- /** Whether this token should be boosted at the top of all app window tokens. */
- @VisibleForTesting boolean mNeedsZBoost;
- private Letterbox mLetterbox;
-
- private final Point mTmpPoint = new Point();
- private final Rect mTmpRect = new Rect();
- private final Rect mTmpPrevBounds = new Rect();
- private RemoteAnimationDefinition mRemoteAnimationDefinition;
- private AnimatingAppWindowTokenRegistry mAnimatingAppWindowTokenRegistry;
-
- /**
- * A flag to determine if this AWT is in the process of closing or entering PIP. This is needed
- * to help AWT know that the app is in the process of closing but hasn't yet started closing on
- * the WM side.
- */
- private boolean mWillCloseOrEnterPip;
-
- /** Layer used to constrain the animation to a token's stack bounds. */
- SurfaceControl mAnimationBoundsLayer;
-
- /** Whether this token needs to create mAnimationBoundsLayer for cropping animations. */
- boolean mNeedsAnimationBoundsLayer;
-
- private static final int STARTING_WINDOW_TYPE_NONE = 0;
- private static final int STARTING_WINDOW_TYPE_SNAPSHOT = 1;
- private static final int STARTING_WINDOW_TYPE_SPLASH_SCREEN = 2;
-
- private boolean mShowWhenLocked;
- private boolean mInheritShownWhenLocked;
- private boolean mTurnScreenOn;
-
- private AppSaturationInfo mLastAppSaturationInfo;
-
- private final ColorDisplayService.ColorTransformController mColorTransformController =
- (matrix, translation) -> mWmService.mH.post(() -> {
- synchronized (mWmService.mGlobalLock) {
- if (mLastAppSaturationInfo == null) {
- mLastAppSaturationInfo = new AppSaturationInfo();
- }
-
- mLastAppSaturationInfo.setSaturation(matrix, translation);
- updateColorTransform();
- }
- });
-
- AppWindowToken(WindowManagerService service, ActivityTaskManagerService atm,
- ActivityRecord.Token token, ActivityInfo aInfo, ActivityOptions options, Intent intent,
- DisplayContent dc) {
- super(service, token != null ? token.asBinder() : null, TYPE_APPLICATION, true, dc,
- false /* ownerCanManageAppTokens */);
- mAtmService = atm;
- appToken = token;
- mActivityInfo = aInfo;
- mUserId = UserHandle.getUserId(mActivityInfo.applicationInfo.uid);
- packageName = mActivityInfo.applicationInfo.packageName;
- mInputApplicationHandle = new InputApplicationHandle(appToken);
-
- // If the class name in the intent doesn't match that of the target, this is probably an
- // alias. We have to create a new ComponentName object to keep track of the real activity
- // name, so that FLAG_ACTIVITY_CLEAR_TOP is handled properly.
- if (mActivityInfo.targetActivity == null
- || (mActivityInfo.targetActivity.equals(intent.getComponent().getClassName())
- && (mActivityInfo.launchMode == LAUNCH_MULTIPLE
- || mActivityInfo.launchMode == LAUNCH_SINGLE_TOP))) {
- mActivityComponent = intent.getComponent();
- } else {
- mActivityComponent =
- new ComponentName(mActivityInfo.packageName, mActivityInfo.targetActivity);
- }
-
- mTargetSdk = mActivityInfo.applicationInfo.targetSdkVersion;
- mShowForAllUsers = (mActivityInfo.flags & FLAG_SHOW_FOR_ALL_USERS) != 0;
- setOrientation(mActivityInfo.screenOrientation);
- mRotationAnimationHint = mActivityInfo.rotationAnimation;
-
- mShowWhenLocked = (aInfo.flags & ActivityInfo.FLAG_SHOW_WHEN_LOCKED) != 0;
- mInheritShownWhenLocked = (aInfo.privateFlags & FLAG_INHERIT_SHOW_WHEN_LOCKED) != 0;
- mTurnScreenOn = (aInfo.flags & FLAG_TURN_SCREEN_ON) != 0;
-
- int realTheme = mActivityInfo.getThemeResource();
- if (realTheme == Resources.ID_NULL) {
- realTheme = aInfo.applicationInfo.targetSdkVersion < HONEYCOMB
- ? android.R.style.Theme : android.R.style.Theme_Holo;
- }
-
- final AttributeCache.Entry ent = AttributeCache.instance().get(packageName,
- realTheme, com.android.internal.R.styleable.Window, mUserId);
-
- if (ent != null) {
- mOccludesParent = !ActivityInfo.isTranslucentOrFloating(ent.array);
- hasWallpaper = ent.array.getBoolean(R.styleable.Window_windowShowWallpaper, false);
- noDisplay = ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false);
- } else {
- hasWallpaper = false;
- noDisplay = false;
- }
-
- if (options != null) {
- mLaunchTaskBehind = options.getLaunchTaskBehind();
-
- final int rotationAnimation = options.getRotationAnimationHint();
- // Only override manifest supplied option if set.
- if (rotationAnimation >= 0) {
- mRotationAnimationHint = rotationAnimation;
- }
- }
-
- // Application tokens start out hidden.
- setHidden(true);
- hiddenRequested = true;
-
- ColorDisplayService.ColorDisplayServiceInternal cds = LocalServices.getService(
- ColorDisplayService.ColorDisplayServiceInternal.class);
- cds.attachColorTransformController(packageName, mUserId,
- new WeakReference<>(mColorTransformController));
- }
-
- void onAttachToTask(boolean voiceInteraction, DisplayContent dc,
- long inputDispatchingTimeoutNanos) {
- mInputDispatchingTimeoutNanos = inputDispatchingTimeoutNanos;
- mVoiceInteraction = voiceInteraction;
- onDisplayChanged(dc);
-
- // Application tokens start out hidden.
- setHidden(true);
- hiddenRequested = true;
- }
-
- void onFirstWindowDrawn(WindowState win, WindowStateAnimator winAnimator) {
- firstWindowDrawn = true;
-
- // We now have a good window to show, remove dead placeholders
- removeDeadWindows();
-
- if (startingWindow != null) {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Finish starting %s"
- + ": first real window is shown, no animation", win.mToken);
- // If this initial window is animating, stop it -- we will do an animation to reveal
- // it from behind the starting window, so there is no need for it to also be doing its
- // own stuff.
- win.cancelAnimation();
- }
- removeStartingWindow();
- updateReportedVisibilityLocked();
- }
-
- void updateReportedVisibilityLocked() {
- if (appToken == null) {
- return;
- }
-
- if (DEBUG_VISIBILITY) Slog.v(TAG, "Update reported visibility: " + this);
- final int count = mChildren.size();
-
- mReportedVisibilityResults.reset();
-
- for (int i = 0; i < count; i++) {
- final WindowState win = mChildren.get(i);
- win.updateReportedVisibility(mReportedVisibilityResults);
- }
-
- int numInteresting = mReportedVisibilityResults.numInteresting;
- int numVisible = mReportedVisibilityResults.numVisible;
- int numDrawn = mReportedVisibilityResults.numDrawn;
- boolean nowGone = mReportedVisibilityResults.nowGone;
-
- boolean nowDrawn = numInteresting > 0 && numDrawn >= numInteresting;
- boolean nowVisible = numInteresting > 0 && numVisible >= numInteresting && !isHidden();
- if (!nowGone) {
- // If the app is not yet gone, then it can only become visible/drawn.
- if (!nowDrawn) {
- nowDrawn = reportedDrawn;
- }
- if (!nowVisible) {
- nowVisible = reportedVisible;
- }
- }
- if (DEBUG_VISIBILITY) Slog.v(TAG, "VIS " + this + ": interesting="
- + numInteresting + " visible=" + numVisible);
- if (nowDrawn != reportedDrawn) {
- onWindowsDrawn(nowDrawn, SystemClock.elapsedRealtimeNanos());
- reportedDrawn = nowDrawn;
- }
- if (nowVisible != reportedVisible) {
- if (DEBUG_VISIBILITY) Slog.v(TAG,
- "Visibility changed in " + this + ": vis=" + nowVisible);
- reportedVisible = nowVisible;
- if (nowVisible) {
- onWindowsVisible();
- } else {
- onWindowsGone();
- }
- }
- }
-
- // Mostly implemented in ActivityRecord.
- void onWindowsDrawn(boolean drawn, long timestamp) {
- }
-
- // Mostly implemented in ActivityRecord. Keeping here for the logpoint.
- void onWindowsGone() {
- if (DEBUG_VISIBILITY) Slog.v(TAG_WM, "Reporting gone in " + appToken);
- }
-
- // Mostly implemented in ActivityRecord. Keeping here for the logpoint.
- void onWindowsVisible() {
- if (DEBUG_VISIBILITY) Slog.v(TAG_WM, "Reporting visible in " + appToken);
- }
-
- boolean isClientHidden() {
- return mClientHidden;
- }
-
- void setClientHidden(boolean hideClient) {
- if (mClientHidden == hideClient || (hideClient && mDeferHidingClient)) {
- return;
- }
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
- "setClientHidden: %s clientHidden=%b Callers=%s", this, hideClient,
- Debug.getCallers(5));
- mClientHidden = hideClient;
- sendAppVisibilityToClients();
- }
-
- void setVisibility(boolean visible, boolean deferHidingClient) {
- final AppTransition appTransition = getDisplayContent().mAppTransition;
-
- // Don't set visibility to false if we were already not visible. This prevents WM from
- // adding the app to the closing app list which doesn't make sense for something that is
- // already not visible. However, set visibility to true even if we are already visible.
- // This makes sure the app is added to the opening apps list so that the right
- // transition can be selected.
- // TODO: Probably a good idea to separate the concept of opening/closing apps from the
- // concept of setting visibility...
- if (!visible && hiddenRequested) {
-
- if (!deferHidingClient && mDeferHidingClient) {
- // We previously deferred telling the client to hide itself when visibility was
- // initially set to false. Now we would like it to hide, so go ahead and set it.
- mDeferHidingClient = deferHidingClient;
- setClientHidden(true);
- }
- return;
- }
-
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
- "setAppVisibility(%s, visible=%b): %s hidden=%b hiddenRequested=%b Callers=%s",
- appToken, visible, appTransition, isHidden(), hiddenRequested,
- Debug.getCallers(6));
-
- final DisplayContent displayContent = getDisplayContent();
- displayContent.mOpeningApps.remove(this);
- displayContent.mClosingApps.remove(this);
- if (isInChangeTransition()) {
- clearChangeLeash(getPendingTransaction(), true /* cancel */);
- }
- displayContent.mChangingApps.remove(this);
- waitingToShow = false;
- hiddenRequested = !visible;
- mDeferHidingClient = deferHidingClient;
-
- if (!visible) {
- // If the app is dead while it was visible, we kept its dead window on screen.
- // Now that the app is going invisible, we can remove it. It will be restarted
- // if made visible again.
- removeDeadWindows();
- } else {
- if (!appTransition.isTransitionSet()
- && appTransition.isReady()) {
- // Add the app mOpeningApps if transition is unset but ready. This means
- // we're doing a screen freeze, and the unfreeze will wait for all opening
- // apps to be ready.
- displayContent.mOpeningApps.add(this);
- }
- startingMoved = false;
- // If the token is currently hidden (should be the common case), or has been
- // stopped, then we need to set up to wait for its windows to be ready.
- if (isHidden() || mAppStopped) {
- clearAllDrawn();
-
- // If the app was already visible, don't reset the waitingToShow state.
- if (isHidden()) {
- waitingToShow = true;
-
- // If the client isn't hidden, we don't need to reset the drawing state.
- if (isClientHidden()) {
- // Let's reset the draw state in order to prevent the starting window to be
- // immediately dismissed when the app still has the surface.
- forAllWindows(w -> {
- if (w.mWinAnimator.mDrawState == HAS_DRAWN) {
- w.mWinAnimator.resetDrawState();
-
- // Force add to mResizingWindows, so that we are guaranteed to get
- // another reportDrawn callback.
- w.resetLastContentInsets();
- }
- }, true /* traverseTopToBottom */);
- }
- }
- }
-
- // In the case where we are making an app visible but holding off for a transition,
- // we still need to tell the client to make its windows visible so they get drawn.
- // Otherwise, we will wait on performing the transition until all windows have been
- // drawn, they never will be, and we are sad.
- setClientHidden(false);
-
- requestUpdateWallpaperIfNeeded();
-
- ProtoLog.v(WM_DEBUG_ADD_REMOVE, "No longer Stopped: %s", this);
- mAppStopped = false;
-
- transferStartingWindowFromHiddenAboveTokenIfNeeded();
- }
-
- // If we are preparing an app transition, then delay changing
- // the visibility of this token until we execute that transition.
- if (okToAnimate() && appTransition.isTransitionSet()) {
- inPendingTransaction = true;
- if (visible) {
- displayContent.mOpeningApps.add(this);
- mEnteringAnimation = true;
- } else {
- displayContent.mClosingApps.add(this);
- mEnteringAnimation = false;
- }
- if (appTransition.getAppTransition() == TRANSIT_TASK_OPEN_BEHIND) {
- // We're launchingBehind, add the launching activity to mOpeningApps.
- final WindowState win = getDisplayContent().findFocusedWindow();
- if (win != null) {
- final AppWindowToken focusedToken = win.mAppToken;
- if (focusedToken != null) {
- ProtoLog.d(WM_DEBUG_APP_TRANSITIONS,
- "TRANSIT_TASK_OPEN_BEHIND, adding %s to mOpeningApps",
- focusedToken);
-
- // Force animation to be loaded.
- displayContent.mOpeningApps.add(focusedToken);
- }
- }
- }
- return;
- }
-
- commitVisibility(null, visible, TRANSIT_UNSET, true, mVoiceInteraction);
- updateReportedVisibilityLocked();
- }
-
- boolean commitVisibility(WindowManager.LayoutParams lp,
- boolean visible, int transit, boolean performLayout, boolean isVoiceInteraction) {
-
- boolean delayed = false;
- inPendingTransaction = false;
- // Reset the state of mHiddenSetFromTransferredStartingWindow since visibility is actually
- // been set by the app now.
- mHiddenSetFromTransferredStartingWindow = false;
-
- // Allow for state changes and animation to be applied if:
- // * token is transitioning visibility state
- // * or the token was marked as hidden and is exiting before we had a chance to play the
- // transition animation
- // * or this is an opening app and windows are being replaced
- // * or the token is the opening app and visible while opening task behind existing one.
- final DisplayContent displayContent = getDisplayContent();
- boolean visibilityChanged = false;
- if (isHidden() == visible || (isHidden() && mIsExiting)
- || (visible && waitingForReplacement())
- || (visible && displayContent.mOpeningApps.contains(this)
- && displayContent.mAppTransition.getAppTransition() == TRANSIT_TASK_OPEN_BEHIND)) {
- final AccessibilityController accessibilityController =
- mWmService.mAccessibilityController;
- boolean changed = false;
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
- "Changing app %s hidden=%b performLayout=%b", this, isHidden(),
- performLayout);
-
- boolean runningAppAnimation = false;
-
- if (transit != WindowManager.TRANSIT_UNSET) {
- if (mUseTransferredAnimation) {
- runningAppAnimation = isReallyAnimating();
- } else if (applyAnimationLocked(lp, transit, visible, isVoiceInteraction)) {
- runningAppAnimation = true;
- }
- delayed = runningAppAnimation;
- final WindowState window = findMainWindow();
- if (window != null && accessibilityController != null) {
- accessibilityController.onAppWindowTransitionLocked(window, transit);
- }
- changed = true;
- }
-
- final int windowsCount = mChildren.size();
- for (int i = 0; i < windowsCount; i++) {
- final WindowState win = mChildren.get(i);
- changed |= win.onAppVisibilityChanged(visible, runningAppAnimation);
- }
-
- setHidden(!visible);
- hiddenRequested = !visible;
- visibilityChanged = true;
- if (!visible) {
- stopFreezingScreen(true, true);
- } else {
- // If we are being set visible, and the starting window is not yet displayed,
- // then make sure it doesn't get displayed.
- if (startingWindow != null && !startingWindow.isDrawnLw()) {
- startingWindow.clearPolicyVisibilityFlag(LEGACY_POLICY_VISIBILITY);
- startingWindow.mLegacyPolicyVisibilityAfterAnim = false;
- }
-
- // We are becoming visible, so better freeze the screen with the windows that are
- // getting visible so we also wait for them.
- forAllWindows(mWmService::makeWindowFreezingScreenIfNeededLocked, true);
- }
-
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
- "commitVisibility: %s: hidden=%b hiddenRequested=%b", this,
- isHidden(), hiddenRequested);
-
- if (changed) {
- displayContent.getInputMonitor().setUpdateInputWindowsNeededLw();
- if (performLayout) {
- mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_WILL_PLACE_SURFACES,
- false /*updateInputWindows*/);
- mWmService.mWindowPlacerLocked.performSurfacePlacement();
- }
- displayContent.getInputMonitor().updateInputWindowsLw(false /*force*/);
- }
- }
- mUseTransferredAnimation = false;
-
- if (isReallyAnimating()) {
- delayed = true;
- } else {
-
- // We aren't animating anything, but exiting windows rely on the animation finished
- // callback being called in case the AppWindowToken was pretending to be animating,
- // which we might have done because we were in closing/opening apps list.
- onAnimationFinished();
- }
-
- for (int i = mChildren.size() - 1; i >= 0 && !delayed; i--) {
- if ((mChildren.get(i)).isSelfOrChildAnimating()) {
- delayed = true;
- }
- }
-
- if (visibilityChanged) {
- if (visible && !delayed) {
- // The token was made immediately visible, there will be no entrance animation.
- // We need to inform the client the enter animation was finished.
- mEnteringAnimation = true;
- mWmService.mActivityManagerAppTransitionNotifier.onAppTransitionFinishedLocked(
- token);
- }
-
- // If we're becoming visible, immediately change client visibility as well. there seem
- // to be some edge cases where we change our visibility but client visibility never gets
- // updated.
- // If we're becoming invisible, update the client visibility if we are not running an
- // animation. Otherwise, we'll update client visibility in onAnimationFinished.
- if (visible || !isReallyAnimating()) {
- setClientHidden(!visible);
- }
-
- if (!displayContent.mClosingApps.contains(this)
- && !displayContent.mOpeningApps.contains(this)) {
- // The token is not closing nor opening, so even if there is an animation set, that
- // doesn't mean that it goes through the normal app transition cycle so we have
- // to inform the docked controller about visibility change.
- // TODO(multi-display): notify docked divider on all displays where visibility was
- // affected.
- displayContent.getDockedDividerController().notifyAppVisibilityChanged();
-
- // Take the screenshot before possibly hiding the WSA, otherwise the screenshot
- // will not be taken.
- mWmService.mTaskSnapshotController.notifyAppVisibilityChanged(this, visible);
- }
-
- // If we are hidden but there is no delay needed we immediately
- // apply the Surface transaction so that the ActivityManager
- // can have some guarantee on the Surface state following
- // setting the visibility. This captures cases like dismissing
- // the docked or pinned stack where there is no app transition.
- //
- // In the case of a "Null" animation, there will be
- // no animation but there will still be a transition set.
- // We still need to delay hiding the surface such that it
- // can be synchronized with showing the next surface in the transition.
- if (isHidden() && !delayed && !displayContent.mAppTransition.isTransitionSet()) {
- SurfaceControl.openTransaction();
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- mChildren.get(i).mWinAnimator.hide("immediately hidden");
- }
- SurfaceControl.closeTransaction();
- }
- }
-
- return delayed;
- }
-
- boolean mayFreezeScreenLocked() {
- return false;
- }
-
- void reportDescendantOrientationChangeIfNeeded() {
- // Orientation request is exposed only when we're visible. Therefore visibility change
- // will change requested orientation. Notify upward the hierarchy ladder to adjust
- // configuration. This is important to cases where activities with incompatible
- // orientations launch, or user goes back from an activity of bi-orientation to an
- // activity with specified orientation.
- if (getRequestedOrientation() == SCREEN_ORIENTATION_UNSET) {
- return;
- }
-
- final IBinder freezeToken = mayFreezeScreenLocked() ? appToken : null;
- onDescendantOrientationChanged(freezeToken, this);
- }
-
- /**
- * @return The to top most child window for which {@link LayoutParams#isFullscreen()} returns
- * true.
- */
- WindowState getTopFullscreenWindow() {
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState win = mChildren.get(i);
- if (win != null && win.mAttrs.isFullscreen()) {
- return win;
- }
- }
- return null;
- }
-
- WindowState findMainWindow() {
- return findMainWindow(true);
- }
-
- /**
- * Finds the main window that either has type base application or application starting if
- * requested.
- *
- * @param includeStartingApp Allow to search application-starting windows to also be returned.
- * @return The main window of type base application or application starting if requested.
- */
- WindowState findMainWindow(boolean includeStartingApp) {
- WindowState candidate = null;
- for (int j = mChildren.size() - 1; j >= 0; --j) {
- final WindowState win = mChildren.get(j);
- final int type = win.mAttrs.type;
- // No need to loop through child window as base application and starting types can't be
- // child windows.
- if (type == TYPE_BASE_APPLICATION
- || (includeStartingApp && type == TYPE_APPLICATION_STARTING)) {
- // In cases where there are multiple windows, we prefer the non-exiting window. This
- // happens for example when replacing windows during an activity relaunch. When
- // constructing the animation, we want the new window, not the exiting one.
- if (win.mAnimatingExit) {
- candidate = win;
- } else {
- return win;
- }
- }
- }
- return candidate;
- }
-
- boolean isAlwaysFocusable() {
- return (mActivityInfo.flags & FLAG_ALWAYS_FOCUSABLE) != 0;
- }
-
- // TODO: Does this really need to be different from isAlwaysFocusable()? For the activity side
- // focusable means resumeable. I guess with that in mind maybe we should rename the other
- // method to isResumeable() or something like that.
- boolean windowsAreFocusable() {
- if (mTargetSdk < Build.VERSION_CODES.Q) {
- final int pid = getPid();
- final AppWindowToken topFocusedAppOfMyProcess =
- mWmService.mRoot.mTopFocusedAppByProcess.get(pid);
- if (topFocusedAppOfMyProcess != null && topFocusedAppOfMyProcess != this) {
- // For the apps below Q, there can be only one app which has the focused window per
- // process, because legacy apps may not be ready for a multi-focus system.
- return false;
- }
- }
- return getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable();
- }
-
- // Mostly implemented in ActivityRecord...
- int getPid() {
- return 0;
- }
-
- @Override
- boolean isVisible() {
- // If the app token isn't hidden then it is considered visible and there is no need to check
- // its children windows to see if they are visible.
- return !isHidden();
- }
-
- @Override
- void removeImmediately() {
- onRemovedFromDisplay();
- super.removeImmediately();
- }
-
- @Override
- void removeIfPossible() {
- mIsExiting = false;
- removeAllWindowsIfPossible();
- removeImmediately();
- }
-
- @Override
- boolean checkCompleteDeferredRemoval() {
- if (mIsExiting) {
- removeIfPossible();
- }
- return super.checkCompleteDeferredRemoval();
- }
-
- void onRemovedFromDisplay() {
- if (mRemovingFromDisplay) {
- return;
- }
- mRemovingFromDisplay = true;
-
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Removing app token: %s", this);
-
- boolean delayed = commitVisibility(null, false, TRANSIT_UNSET, true, mVoiceInteraction);
-
- getDisplayContent().mOpeningApps.remove(this);
- getDisplayContent().mChangingApps.remove(this);
- getDisplayContent().mUnknownAppVisibilityController.appRemovedOrHidden(this);
- mWmService.mTaskSnapshotController.onAppRemoved(this);
- waitingToShow = false;
- if (getDisplayContent().mClosingApps.contains(this)) {
- delayed = true;
- } else if (getDisplayContent().mAppTransition.isTransitionSet()) {
- getDisplayContent().mClosingApps.add(this);
- delayed = true;
- }
-
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
- "Removing app %s delayed=%b animation=%s animating=%b", this, delayed,
- getAnimation(), isSelfAnimating());
-
- ProtoLog.v(WM_DEBUG_ADD_REMOVE, "removeAppToken: %s"
- + " delayed=%b Callers=%s", this, delayed, Debug.getCallers(4));
-
- if (mStartingData != null) {
- removeStartingWindow();
- }
-
- // If this window was animating, then we need to ensure that the app transition notifies
- // that animations have completed in DisplayContent.handleAnimatingStoppedAndTransition(),
- // so add to that list now
- if (isSelfAnimating()) {
- getDisplayContent().mNoAnimationNotifyOnTransitionFinished.add(token);
- }
-
- final TaskStack stack = getStack();
- if (delayed && !isEmpty()) {
- // set the token aside because it has an active animation to be finished
- ProtoLog.v(WM_DEBUG_ADD_REMOVE,
- "removeAppToken make exiting: %s", this);
- if (stack != null) {
- stack.mExitingAppTokens.add(this);
- }
- mIsExiting = true;
- } else {
- // Make sure there is no animation running on this token, so any windows associated
- // with it will be removed as soon as their animations are complete
- cancelAnimation();
- if (stack != null) {
- stack.mExitingAppTokens.remove(this);
- }
- removeIfPossible();
- }
-
- removed = true;
- stopFreezingScreen(true, true);
-
- final DisplayContent dc = getDisplayContent();
- if (dc.mFocusedApp == this) {
- ProtoLog.v(WM_DEBUG_FOCUS_LIGHT,
- "Removing focused app token:%s displayId=%d", this,
- dc.getDisplayId());
- dc.setFocusedApp(null);
- mWmService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, true /*updateInputWindows*/);
- }
- if (mLetterbox != null) {
- mLetterbox.destroy();
- mLetterbox = null;
- }
-
- if (!delayed) {
- updateReportedVisibilityLocked();
- }
-
- // Reset the last saved PiP snap fraction on removal.
- mDisplayContent.mPinnedStackControllerLocked.resetReentrySnapFraction(mActivityComponent);
-
- mRemovingFromDisplay = false;
- }
-
- void clearAnimatingFlags() {
- boolean wallpaperMightChange = false;
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState win = mChildren.get(i);
- wallpaperMightChange |= win.clearAnimatingFlags();
- }
- if (wallpaperMightChange) {
- requestUpdateWallpaperIfNeeded();
- }
- }
-
- void destroySurfaces() {
- destroySurfaces(false /*cleanupOnResume*/);
- }
-
- /**
- * Destroy surfaces which have been marked as eligible by the animator, taking care to ensure
- * the client has finished with them.
- *
- * @param cleanupOnResume whether this is done when app is resumed without fully stopped. If
- * set to true, destroy only surfaces of removed windows, and clear relevant flags of the
- * others so that they are ready to be reused. If set to false (common case), destroy all
- * surfaces that's eligible, if the app is already stopped.
- */
- private void destroySurfaces(boolean cleanupOnResume) {
- boolean destroyedSomething = false;
-
- // Copying to a different list as multiple children can be removed.
- final ArrayList<WindowState> children = new ArrayList<>(mChildren);
- for (int i = children.size() - 1; i >= 0; i--) {
- final WindowState win = children.get(i);
- destroyedSomething |= win.destroySurface(cleanupOnResume, mAppStopped);
- }
- if (destroyedSomething) {
- final DisplayContent dc = getDisplayContent();
- dc.assignWindowLayers(true /*setLayoutNeeded*/);
- updateLetterboxSurface(null);
- }
- }
-
- /**
- * Notify that the app is now resumed, and it was not stopped before, perform a clean
- * up of the surfaces
- */
- void notifyAppResumed(boolean wasStopped) {
- ProtoLog.v(WM_DEBUG_ADD_REMOVE, "notifyAppResumed: wasStopped=%b %s",
- wasStopped, this);
- mAppStopped = false;
- // Allow the window to turn the screen on once the app is resumed again.
- setCurrentLaunchCanTurnScreenOn(true);
- if (!wasStopped) {
- destroySurfaces(true /*cleanupOnResume*/);
- }
- }
-
- /**
- * Notify that the app has stopped, and it is okay to destroy any surfaces which were
- * keeping alive in case they were still being used.
- */
- void notifyAppStopped() {
- ProtoLog.v(WM_DEBUG_ADD_REMOVE, "notifyAppStopped: %s", this);
- mAppStopped = true;
- // Reset the last saved PiP snap fraction on app stop.
- mDisplayContent.mPinnedStackControllerLocked.resetReentrySnapFraction(mActivityComponent);
- destroySurfaces();
- // Remove any starting window that was added for this app if they are still around.
- removeStartingWindow();
- }
-
- void clearAllDrawn() {
- allDrawn = false;
- deferClearAllDrawn = false;
- }
-
- Task getTask() {
- return (Task) getParent();
- }
-
- TaskStack getStack() {
- final Task task = getTask();
- if (task != null) {
- return task.mStack;
- } else {
- return null;
- }
- }
-
- @Override
- void onParentChanged() {
- super.onParentChanged();
-
- final Task task = getTask();
-
- // When the associated task is {@code null}, the {@link AppWindowToken} can no longer
- // access visual elements like the {@link DisplayContent}. We must remove any associations
- // such as animations.
- if (!mReparenting) {
- if (task == null) {
- // It is possible we have been marked as a closing app earlier. We must remove ourselves
- // from this list so we do not participate in any future animations.
- if (getDisplayContent() != null) {
- getDisplayContent().mClosingApps.remove(this);
- }
- } else if (mLastParent != null && mLastParent.mStack != null) {
- task.mStack.mExitingAppTokens.remove(this);
- }
- }
- final TaskStack stack = getStack();
-
- // If we reparent, make sure to remove ourselves from the old animation registry.
- if (mAnimatingAppWindowTokenRegistry != null) {
- mAnimatingAppWindowTokenRegistry.notifyFinished(this);
- }
- mAnimatingAppWindowTokenRegistry = stack != null
- ? stack.getAnimatingAppWindowTokenRegistry()
- : null;
-
- mLastParent = task;
-
- updateColorTransform();
- }
-
- void postWindowRemoveStartingWindowCleanup(WindowState win) {
- // TODO: Something smells about the code below...Is there a better way?
- if (startingWindow == win) {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Notify removed startingWindow %s", win);
- removeStartingWindow();
- } else if (mChildren.size() == 0) {
- // If this is the last window and we had requested a starting transition window,
- // well there is no point now.
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Nulling last startingData");
- mStartingData = null;
- if (mHiddenSetFromTransferredStartingWindow) {
- // We set the hidden state to false for the token from a transferred starting window.
- // We now reset it back to true since the starting window was the last window in the
- // token.
- setHidden(true);
- }
- } else if (mChildren.size() == 1 && startingSurface != null && !isRelaunching()) {
- // If this is the last window except for a starting transition window,
- // we need to get rid of the starting transition.
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Last window, removing starting window %s", win);
- removeStartingWindow();
- }
- }
-
- void removeDeadWindows() {
- for (int winNdx = mChildren.size() - 1; winNdx >= 0; --winNdx) {
- WindowState win = mChildren.get(winNdx);
- if (win.mAppDied) {
- ProtoLog.w(WM_DEBUG_ADD_REMOVE,
- "removeDeadWindows: %s", win);
- // Set mDestroying, we don't want any animation or delayed removal here.
- win.mDestroying = true;
- // Also removes child windows.
- win.removeIfPossible();
- }
- }
- }
-
- boolean hasWindowsAlive() {
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- // No need to loop through child windows as the answer should be the same as that of the
- // parent window.
- if (!(mChildren.get(i)).mAppDied) {
- return true;
- }
- }
- return false;
- }
-
- void setWillReplaceWindows(boolean animate) {
- ProtoLog.d(WM_DEBUG_ADD_REMOVE,
- "Marking app token %s with replacing windows.", this);
-
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState w = mChildren.get(i);
- w.setWillReplaceWindow(animate);
- }
- }
-
- void setWillReplaceChildWindows() {
- ProtoLog.d(WM_DEBUG_ADD_REMOVE, "Marking app token %s"
- + " with replacing child windows.", this);
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState w = mChildren.get(i);
- w.setWillReplaceChildWindows();
- }
- }
-
- void clearWillReplaceWindows() {
- ProtoLog.d(WM_DEBUG_ADD_REMOVE,
- "Resetting app token %s of replacing window marks.", this);
-
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState w = mChildren.get(i);
- w.clearWillReplaceWindow();
- }
- }
-
- void requestUpdateWallpaperIfNeeded() {
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState w = mChildren.get(i);
- w.requestUpdateWallpaperIfNeeded();
- }
- }
-
- boolean isRelaunching() {
- return mPendingRelaunchCount > 0;
- }
-
- boolean shouldFreezeBounds() {
- final Task task = getTask();
-
- // For freeform windows, we can't freeze the bounds at the moment because this would make
- // the resizing unresponsive.
- if (task == null || task.inFreeformWindowingMode()) {
- return false;
- }
-
- // We freeze the bounds while drag resizing to deal with the time between
- // the divider/drag handle being released, and the handling it's new
- // configuration. If we are relaunched outside of the drag resizing state,
- // we need to be careful not to do this.
- return getTask().isDragResizing();
- }
-
- void startRelaunching() {
- if (shouldFreezeBounds()) {
- freezeBounds();
- }
-
- // In the process of tearing down before relaunching, the app will
- // try and clean up it's child surfaces. We need to prevent this from
- // happening, so we sever the children, transfering their ownership
- // from the client it-self to the parent surface (owned by us).
- detachChildren();
-
- mPendingRelaunchCount++;
- }
-
- void detachChildren() {
- SurfaceControl.openTransaction();
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState w = mChildren.get(i);
- w.mWinAnimator.detachChildren();
- }
- SurfaceControl.closeTransaction();
- }
-
- void finishRelaunching() {
- unfreezeBounds();
-
- if (mPendingRelaunchCount > 0) {
- mPendingRelaunchCount--;
- } else {
- // Update keyguard flags upon finishing relaunch.
- checkKeyguardFlagsChanged();
- }
- }
-
- void clearRelaunching() {
- if (mPendingRelaunchCount == 0) {
- return;
- }
- unfreezeBounds();
- mPendingRelaunchCount = 0;
- }
-
- /**
- * Returns true if the new child window we are adding to this token is considered greater than
- * the existing child window in this token in terms of z-order.
- */
- @Override
- protected boolean isFirstChildWindowGreaterThanSecond(WindowState newWindow,
- WindowState existingWindow) {
- final int type1 = newWindow.mAttrs.type;
- final int type2 = existingWindow.mAttrs.type;
-
- // Base application windows should be z-ordered BELOW all other windows in the app token.
- if (type1 == TYPE_BASE_APPLICATION && type2 != TYPE_BASE_APPLICATION) {
- return false;
- } else if (type1 != TYPE_BASE_APPLICATION && type2 == TYPE_BASE_APPLICATION) {
- return true;
- }
-
- // Starting windows should be z-ordered ABOVE all other windows in the app token.
- if (type1 == TYPE_APPLICATION_STARTING && type2 != TYPE_APPLICATION_STARTING) {
- return true;
- } else if (type1 != TYPE_APPLICATION_STARTING && type2 == TYPE_APPLICATION_STARTING) {
- return false;
- }
-
- // Otherwise the new window is greater than the existing window.
- return true;
- }
-
- /**
- * @return {@code true} if starting window is in app's hierarchy.
- */
- boolean hasStartingWindow() {
- if (startingDisplayed || mStartingData != null) {
- return true;
- }
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- if (getChildAt(i).mAttrs.type == TYPE_APPLICATION_STARTING) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- void addWindow(WindowState w) {
- super.addWindow(w);
-
- boolean gotReplacementWindow = false;
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState candidate = mChildren.get(i);
- gotReplacementWindow |= candidate.setReplacementWindowIfNeeded(w);
- }
-
- // if we got a replacement window, reset the timeout to give drawing more time
- if (gotReplacementWindow) {
- mWmService.scheduleWindowReplacementTimeouts(this);
- }
- checkKeyguardFlagsChanged();
- }
-
- @Override
- void removeChild(WindowState child) {
- if (!mChildren.contains(child)) {
- // This can be true when testing.
- return;
- }
- super.removeChild(child);
- checkKeyguardFlagsChanged();
- updateLetterboxSurface(child);
- }
-
- private boolean waitingForReplacement() {
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState candidate = mChildren.get(i);
- if (candidate.waitingForReplacement()) {
- return true;
- }
- }
- return false;
- }
-
- void onWindowReplacementTimeout() {
- for (int i = mChildren.size() - 1; i >= 0; --i) {
- (mChildren.get(i)).onWindowReplacementTimeout();
- }
- }
-
- void reparent(Task task, int position) {
- ProtoLog.i(WM_DEBUG_ADD_REMOVE, "reparent: moving app token=%s"
- + " to task=%d at %d", this, task.mTaskId, position);
-
- if (task == null) {
- throw new IllegalArgumentException("reparent: could not find task");
- }
- final Task currentTask = getTask();
- if (task == currentTask) {
- throw new IllegalArgumentException(
- "window token=" + this + " already child of task=" + currentTask);
- }
-
- if (currentTask.mStack != task.mStack) {
- throw new IllegalArgumentException(
- "window token=" + this + " current task=" + currentTask
- + " belongs to a different stack than " + task);
- }
-
- ProtoLog.i(WM_DEBUG_ADD_REMOVE, "reParentWindowToken: removing window token=%s"
- + " from task=%s" , this, currentTask);
- final DisplayContent prevDisplayContent = getDisplayContent();
-
- mReparenting = true;
-
- getParent().removeChild(this);
- task.addChild((ActivityRecord) this, position);
-
- mReparenting = false;
-
- // Relayout display(s).
- final DisplayContent displayContent = task.getDisplayContent();
- displayContent.setLayoutNeeded();
- if (prevDisplayContent != displayContent) {
- onDisplayChanged(displayContent);
- prevDisplayContent.setLayoutNeeded();
- }
- getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
- }
-
- @Override
- void onDisplayChanged(DisplayContent dc) {
- DisplayContent prevDc = mDisplayContent;
- super.onDisplayChanged(dc);
- if (prevDc == null || prevDc == mDisplayContent) {
- return;
- }
-
- if (prevDc.mOpeningApps.remove(this)) {
- // Transfer opening transition to new display.
- mDisplayContent.mOpeningApps.add(this);
- mDisplayContent.prepareAppTransition(prevDc.mAppTransition.getAppTransition(), true);
- mDisplayContent.executeAppTransition();
- }
-
- if (prevDc.mChangingApps.remove(this)) {
- // This gets called *after* the AppWindowToken has been reparented to the new display.
- // That reparenting resulted in this window changing modes (eg. FREEFORM -> FULLSCREEN),
- // so this token is now "frozen" while waiting for the animation to start on prevDc
- // (which will be cancelled since the window is no-longer a child). However, since this
- // is no longer a child of prevDc, this won't be notified of the cancelled animation,
- // so we need to cancel the change transition here.
- clearChangeLeash(getPendingTransaction(), true /* cancel */);
- }
- prevDc.mClosingApps.remove(this);
-
- if (prevDc.mFocusedApp == this) {
- prevDc.setFocusedApp(null);
- final TaskStack stack = dc.getTopStack();
- if (stack != null) {
- final Task task = stack.getTopChild();
- if (task != null && task.getTopChild() == this) {
- dc.setFocusedApp(this);
- }
- }
- }
-
- if (mLetterbox != null) {
- mLetterbox.onMovedToDisplay(mDisplayContent.getDisplayId());
- }
- }
-
- /**
- * Freezes the task bounds. The size of this task reported the app will be fixed to the bounds
- * freezed by {@link Task#prepareFreezingBounds} until {@link #unfreezeBounds} gets called, even
- * if they change in the meantime. If the bounds are already frozen, the bounds will be frozen
- * with a queue.
- */
- private void freezeBounds() {
- final Task task = getTask();
- mFrozenBounds.offer(new Rect(task.mPreparedFrozenBounds));
-
- if (task.mPreparedFrozenMergedConfig.equals(Configuration.EMPTY)) {
- // We didn't call prepareFreezingBounds on the task, so use the current value.
- mFrozenMergedConfig.offer(new Configuration(task.getConfiguration()));
- } else {
- mFrozenMergedConfig.offer(new Configuration(task.mPreparedFrozenMergedConfig));
- }
- // Calling unset() to make it equal to Configuration.EMPTY.
- task.mPreparedFrozenMergedConfig.unset();
- }
-
- /**
- * Unfreezes the previously frozen bounds. See {@link #freezeBounds}.
- */
- private void unfreezeBounds() {
- if (mFrozenBounds.isEmpty()) {
- return;
- }
- mFrozenBounds.remove();
- if (!mFrozenMergedConfig.isEmpty()) {
- mFrozenMergedConfig.remove();
- }
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState win = mChildren.get(i);
- win.onUnfreezeBounds();
- }
- mWmService.mWindowPlacerLocked.performSurfacePlacement();
- }
-
- void setAppLayoutChanges(int changes, String reason) {
- if (!mChildren.isEmpty()) {
- final DisplayContent dc = getDisplayContent();
- dc.pendingLayoutChanges |= changes;
- if (DEBUG_LAYOUT_REPEATS) {
- mWmService.mWindowPlacerLocked.debugLayoutRepeats(reason, dc.pendingLayoutChanges);
- }
- }
- }
-
- void removeReplacedWindowIfNeeded(WindowState replacement) {
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- final WindowState win = mChildren.get(i);
- if (win.removeReplacedWindowIfNeeded(replacement)) {
- return;
- }
- }
- }
-
- void startFreezingScreen() {
- ProtoLog.i(WM_DEBUG_ORIENTATION,
- "Set freezing of %s: hidden=%b freezing=%b hiddenRequested=%b. %s",
- appToken, isHidden(), mFreezingScreen, hiddenRequested,
- new RuntimeException().fillInStackTrace());
- if (!hiddenRequested) {
- if (!mFreezingScreen) {
- mFreezingScreen = true;
- mWmService.registerAppFreezeListener(this);
- mWmService.mAppsFreezingScreen++;
- if (mWmService.mAppsFreezingScreen == 1) {
- mWmService.startFreezingDisplayLocked(0, 0, getDisplayContent());
- mWmService.mH.removeMessages(H.APP_FREEZE_TIMEOUT);
- mWmService.mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 2000);
- }
- }
- final int count = mChildren.size();
- for (int i = 0; i < count; i++) {
- final WindowState w = mChildren.get(i);
- w.onStartFreezingScreen();
- }
- }
- }
-
- void stopFreezingScreen(boolean unfreezeSurfaceNow, boolean force) {
- if (!mFreezingScreen) {
- return;
- }
- ProtoLog.v(WM_DEBUG_ORIENTATION,
- "Clear freezing of %s force=%b", this, force);
- final int count = mChildren.size();
- boolean unfrozeWindows = false;
- for (int i = 0; i < count; i++) {
- final WindowState w = mChildren.get(i);
- unfrozeWindows |= w.onStopFreezingScreen();
- }
- if (force || unfrozeWindows) {
- ProtoLog.v(WM_DEBUG_ORIENTATION, "No longer freezing: %s", this);
- mFreezingScreen = false;
- mWmService.unregisterAppFreezeListener(this);
- mWmService.mAppsFreezingScreen--;
- mWmService.mLastFinishedFreezeSource = this;
- }
- if (unfreezeSurfaceNow) {
- if (unfrozeWindows) {
- mWmService.mWindowPlacerLocked.performSurfacePlacement();
- }
- mWmService.stopFreezingDisplayLocked();
- }
- }
-
- @Override
- public void onAppFreezeTimeout() {
- Slog.w(TAG_WM, "Force clearing freeze: " + this);
- stopFreezingScreen(true, true);
- }
-
- /**
- * Tries to transfer the starting window from a token that's above ourselves in the task but
- * not visible anymore. This is a common scenario apps use: Trampoline activity T start main
- * activity M in the same task. Now, when reopening the task, T starts on top of M but then
- * immediately finishes after, so we have to transfer T to M.
- */
- void transferStartingWindowFromHiddenAboveTokenIfNeeded() {
- final Task task = getTask();
- for (int i = task.mChildren.size() - 1; i >= 0; i--) {
- final AppWindowToken fromToken = task.mChildren.get(i);
- if (fromToken == this) {
- return;
- }
- if (fromToken.hiddenRequested && transferStartingWindow(fromToken.token)) {
- return;
- }
- }
- }
-
- boolean transferStartingWindow(IBinder transferFrom) {
- final AppWindowToken fromToken = getDisplayContent().getAppWindowToken(transferFrom);
- if (fromToken == null) {
- return false;
- }
-
- final WindowState tStartingWindow = fromToken.startingWindow;
- if (tStartingWindow != null && fromToken.startingSurface != null) {
- // In this case, the starting icon has already been displayed, so start
- // letting windows get shown immediately without any more transitions.
- getDisplayContent().mSkipAppTransitionAnimation = true;
-
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Moving existing starting %s"
- + " from %s to %s", tStartingWindow, fromToken, this);
-
- final long origId = Binder.clearCallingIdentity();
- try {
- // Transfer the starting window over to the new token.
- mStartingData = fromToken.mStartingData;
- startingSurface = fromToken.startingSurface;
- startingDisplayed = fromToken.startingDisplayed;
- fromToken.startingDisplayed = false;
- startingWindow = tStartingWindow;
- reportedVisible = fromToken.reportedVisible;
- fromToken.mStartingData = null;
- fromToken.startingSurface = null;
- fromToken.startingWindow = null;
- fromToken.startingMoved = true;
- tStartingWindow.mToken = this;
- tStartingWindow.mAppToken = this;
-
- ProtoLog.v(WM_DEBUG_ADD_REMOVE,
- "Removing starting %s from %s", tStartingWindow, fromToken);
- fromToken.removeChild(tStartingWindow);
- fromToken.postWindowRemoveStartingWindowCleanup(tStartingWindow);
- fromToken.mHiddenSetFromTransferredStartingWindow = false;
- addWindow(tStartingWindow);
-
- // Propagate other interesting state between the tokens. If the old token is displayed,
- // we should immediately force the new one to be displayed. If it is animating, we need
- // to move that animation to the new one.
- if (fromToken.allDrawn) {
- allDrawn = true;
- deferClearAllDrawn = fromToken.deferClearAllDrawn;
- }
- if (fromToken.firstWindowDrawn) {
- firstWindowDrawn = true;
- }
- if (!fromToken.isHidden()) {
- setHidden(false);
- hiddenRequested = false;
- mHiddenSetFromTransferredStartingWindow = true;
- }
- setClientHidden(fromToken.mClientHidden);
-
- transferAnimation(fromToken);
-
- // When transferring an animation, we no longer need to apply an animation to the
- // the token we transfer the animation over. Thus, set this flag to indicate we've
- // transferred the animation.
- mUseTransferredAnimation = true;
-
- mWmService.updateFocusedWindowLocked(
- UPDATE_FOCUS_WILL_PLACE_SURFACES, true /*updateInputWindows*/);
- getDisplayContent().setLayoutNeeded();
- mWmService.mWindowPlacerLocked.performSurfacePlacement();
- } finally {
- Binder.restoreCallingIdentity(origId);
- }
- return true;
- } else if (fromToken.mStartingData != null) {
- // The previous app was getting ready to show a
- // starting window, but hasn't yet done so. Steal it!
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
- "Moving pending starting from %s to %s", fromToken, this);
- mStartingData = fromToken.mStartingData;
- fromToken.mStartingData = null;
- fromToken.startingMoved = true;
- scheduleAddStartingWindow();
- return true;
- }
-
- // TODO: Transfer thumbnail
-
- return false;
- }
-
- boolean isLastWindow(WindowState win) {
- return mChildren.size() == 1 && mChildren.get(0) == win;
- }
-
- @Override
- void onAppTransitionDone() {
- sendingToBottom = false;
- }
-
- /**
- * We override because this class doesn't want its children affecting its reported orientation
- * in anyway.
- */
- @Override
- int getOrientation(int candidate) {
- if (candidate == SCREEN_ORIENTATION_BEHIND) {
- // Allow app to specify orientation regardless of its visibility state if the current
- // candidate want us to use orientation behind. I.e. the visible app on-top of this one
- // wants us to use the orientation of the app behind it.
- return mOrientation;
- }
-
- // The {@link AppWindowToken} should only specify an orientation when it is not closing or
- // going to the bottom. Allowing closing {@link AppWindowToken} to participate can lead to
- // an Activity in another task being started in the wrong orientation during the transition.
- if (!(sendingToBottom || getDisplayContent().mClosingApps.contains(this))
- && (isVisible() || getDisplayContent().mOpeningApps.contains(this))) {
- return mOrientation;
- }
-
- return SCREEN_ORIENTATION_UNSET;
- }
-
- /** Returns the app's preferred orientation regardless of its currently visibility state. */
- int getRequestedOrientation() {
- return mOrientation;
- }
-
- /** @return {@code true} if the compatibility bounds is taking effect. */
- boolean hasSizeCompatBounds() {
- return mSizeCompatBounds != null;
- }
-
- @Override
- float getSizeCompatScale() {
- return hasSizeCompatBounds() ? mSizeCompatScale : super.getSizeCompatScale();
- }
-
- @Override
- public void onConfigurationChanged(Configuration newParentConfig) {
- final int prevWinMode = getWindowingMode();
- mTmpPrevBounds.set(getBounds());
- super.onConfigurationChanged(newParentConfig);
-
- final Task task = getTask();
- final Rect overrideBounds = getResolvedOverrideBounds();
- if (task != null && !overrideBounds.isEmpty()
- // If the changes come from change-listener, the incoming parent configuration is
- // still the old one. Make sure their orientations are the same to reduce computing
- // the compatibility bounds for the intermediate state.
- && (task.mTaskRecord == null || task.mTaskRecord
- .getConfiguration().orientation == newParentConfig.orientation)) {
- final Rect taskBounds = task.getBounds();
- // Since we only center the activity horizontally, if only the fixed height is smaller
- // than its container, the override bounds don't need to take effect.
- if ((overrideBounds.width() != taskBounds.width()
- || overrideBounds.height() > taskBounds.height())) {
- calculateCompatBoundsTransformation(newParentConfig);
- updateSurfacePosition();
- } else if (mSizeCompatBounds != null) {
- mSizeCompatBounds = null;
- mSizeCompatScale = 1f;
- updateSurfacePosition();
- }
- }
-
- final int winMode = getWindowingMode();
-
- if (prevWinMode == winMode || mDisplayContent == null) {
- return;
- }
-
- if (prevWinMode == WINDOWING_MODE_PINNED && winMode != WINDOWING_MODE_UNDEFINED
- && !isHidden()) {
- // Leaving PiP to fullscreen, save the snap fraction based on the pre-animation bounds
- // for the next re-entry into PiP (assuming the activity is not hidden or destroyed)
- final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
- if (pinnedStack != null) {
- final Rect stackBounds;
- if (pinnedStack.lastAnimatingBoundsWasToFullscreen()) {
- // We are animating the bounds, use the pre-animation bounds to save the snap
- // fraction
- stackBounds = pinnedStack.mPreAnimationBounds;
- } else {
- // We skip the animation if the fullscreen configuration is not compatible, so
- // use the current bounds to calculate the saved snap fraction instead
- // (see PinnedActivityStack.skipResizeAnimation())
- stackBounds = mTmpRect;
- pinnedStack.getBounds(stackBounds);
- }
- mDisplayContent.mPinnedStackControllerLocked.saveReentrySnapFraction(
- mActivityComponent, stackBounds);
- }
- } else if (shouldStartChangeTransition(prevWinMode, winMode)) {
- initializeChangeTransition(mTmpPrevBounds);
- }
- }
-
- private boolean shouldStartChangeTransition(int prevWinMode, int newWinMode) {
- if (mWmService.mDisableTransitionAnimation
- || !isVisible()
- || getDisplayContent().mAppTransition.isTransitionSet()
- || getSurfaceControl() == null) {
- return false;
- }
- // Only do an animation into and out-of freeform mode for now. Other mode
- // transition animations are currently handled by system-ui.
- return (prevWinMode == WINDOWING_MODE_FREEFORM) != (newWinMode == WINDOWING_MODE_FREEFORM);
- }
-
- /**
- * Initializes a change transition. Because the app is visible already, there is a small period
- * of time where the user can see the app content/window update before the transition starts.
- * To prevent this, we immediately take a snapshot and place the app/snapshot into a leash which
- * "freezes" the location/crop until the transition starts.
- * <p>
- * Here's a walk-through of the process:
- * 1. Create a temporary leash ("interim-change-leash") and reparent the app to it.
- * 2. Set the temporary leash's position/crop to the current state.
- * 3. Create a snapshot and place that at the top of the leash to cover up content changes.
- * 4. Once the transition is ready, it will reparent the app to the animation leash.
- * 5. Detach the interim-change-leash.
- */
- private void initializeChangeTransition(Rect startBounds) {
- mDisplayContent.prepareAppTransition(TRANSIT_TASK_CHANGE_WINDOWING_MODE,
- false /* alwaysKeepCurrent */, 0, false /* forceOverride */);
- mDisplayContent.mChangingApps.add(this);
- mTransitStartRect.set(startBounds);
-
- final SurfaceControl.Builder builder = makeAnimationLeash()
- .setParent(getAnimationLeashParent())
- .setName(getSurfaceControl() + " - interim-change-leash");
- mTransitChangeLeash = builder.build();
- Transaction t = getPendingTransaction();
- t.setWindowCrop(mTransitChangeLeash, startBounds.width(), startBounds.height());
- t.setPosition(mTransitChangeLeash, startBounds.left, startBounds.top);
- t.show(mTransitChangeLeash);
- t.reparent(getSurfaceControl(), mTransitChangeLeash);
- onAnimationLeashCreated(t, mTransitChangeLeash);
-
- // Skip creating snapshot if this transition is controlled by a remote animator which
- // doesn't need it.
- ArraySet<Integer> activityTypes = new ArraySet<>();
- activityTypes.add(getActivityType());
- RemoteAnimationAdapter adapter =
- mDisplayContent.mAppTransitionController.getRemoteAnimationOverride(
- this, TRANSIT_TASK_CHANGE_WINDOWING_MODE, activityTypes);
- if (adapter != null && !adapter.getChangeNeedsSnapshot()) {
- return;
- }
-
- Task task = getTask();
- if (mThumbnail == null && task != null && !hasCommittedReparentToAnimationLeash()) {
- SurfaceControl.ScreenshotGraphicBuffer snapshot =
- mWmService.mTaskSnapshotController.createTaskSnapshot(
- task, 1 /* scaleFraction */);
- if (snapshot != null) {
- mThumbnail = new AppWindowThumbnail(mWmService.mSurfaceFactory, t, this,
- snapshot.getGraphicBuffer(), true /* relative */);
- }
- }
- }
-
- boolean isInChangeTransition() {
- return mTransitChangeLeash != null || AppTransition.isChangeTransit(mTransit);
- }
-
- @VisibleForTesting
- AppWindowThumbnail getThumbnail() {
- return mThumbnail;
- }
-
- /**
- * Calculates the scale and offset to horizontal center the size compatibility bounds into the
- * region which is available to application.
- */
- private void calculateCompatBoundsTransformation(Configuration newParentConfig) {
- final Rect parentAppBounds = newParentConfig.windowConfiguration.getAppBounds();
- final Rect parentBounds = newParentConfig.windowConfiguration.getBounds();
- final Rect viewportBounds = parentAppBounds != null ? parentAppBounds : parentBounds;
- final Rect appBounds = getWindowConfiguration().getAppBounds();
- final Rect contentBounds = appBounds != null ? appBounds : getResolvedOverrideBounds();
- final float contentW = contentBounds.width();
- final float contentH = contentBounds.height();
- final float viewportW = viewportBounds.width();
- final float viewportH = viewportBounds.height();
- // Only allow to scale down.
- mSizeCompatScale = (contentW <= viewportW && contentH <= viewportH)
- ? 1 : Math.min(viewportW / contentW, viewportH / contentH);
- final int offsetX = (int) ((viewportW - contentW * mSizeCompatScale + 1) * 0.5f)
- + viewportBounds.left;
-
- if (mSizeCompatBounds == null) {
- mSizeCompatBounds = new Rect();
- }
- mSizeCompatBounds.set(contentBounds);
- mSizeCompatBounds.offsetTo(0, 0);
- mSizeCompatBounds.scale(mSizeCompatScale);
- // Ensure to align the top with the parent.
- mSizeCompatBounds.top = parentBounds.top;
- // The decor inset is included in height.
- mSizeCompatBounds.bottom += viewportBounds.top;
- mSizeCompatBounds.left += offsetX;
- mSizeCompatBounds.right += offsetX;
- }
-
- @Override
- public Rect getBounds() {
- if (mSizeCompatBounds != null) {
- return mSizeCompatBounds;
- }
- return super.getBounds();
- }
-
- @Override
- public boolean matchParentBounds() {
- if (super.matchParentBounds()) {
- return true;
- }
- // An activity in size compatibility mode may have override bounds which equals to its
- // parent bounds, so the exact bounds should also be checked.
- final WindowContainer parent = getParent();
- return parent == null || parent.getBounds().equals(getResolvedOverrideBounds());
- }
-
- @Override
- void checkAppWindowsReadyToShow() {
- if (allDrawn == mLastAllDrawn) {
- return;
- }
-
- mLastAllDrawn = allDrawn;
- if (!allDrawn) {
- return;
- }
-
- // The token has now changed state to having all windows shown... what to do, what to do?
- if (mFreezingScreen) {
- showAllWindowsLocked();
- stopFreezingScreen(false, true);
- ProtoLog.i(WM_DEBUG_ORIENTATION,
- "Setting mOrientationChangeComplete=true because wtoken %s "
- + "numInteresting=%d numDrawn=%d",
- this, mNumInterestingWindows, mNumDrawnWindows);
- // This will set mOrientationChangeComplete and cause a pass through layout.
- setAppLayoutChanges(FINISH_LAYOUT_REDO_WALLPAPER,
- "checkAppWindowsReadyToShow: freezingScreen");
- } else {
- setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM, "checkAppWindowsReadyToShow");
-
- // We can now show all of the drawn windows!
- if (!getDisplayContent().mOpeningApps.contains(this) && canShowWindows()) {
- showAllWindowsLocked();
- }
- }
- }
-
- /**
- * Returns whether the drawn window states of this {@link AppWindowToken} has considered every
- * child {@link WindowState}. A child is considered if it has been passed into
- * {@link #updateDrawnWindowStates(WindowState)} after being added. This is used to determine
- * whether states, such as {@code allDrawn}, can be set, which relies on state variables such as
- * {@code mNumInterestingWindows}, which depend on all {@link WindowState}s being considered.
- *
- * @return {@code true} If all children have been considered, {@code false}.
- */
- private boolean allDrawnStatesConsidered() {
- for (int i = mChildren.size() - 1; i >= 0; --i) {
- final WindowState child = mChildren.get(i);
- if (child.mightAffectAllDrawn() && !child.getDrawnStateEvaluated()) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Determines if the token has finished drawing. This should only be called from
- * {@link DisplayContent#applySurfaceChangesTransaction}
- */
- void updateAllDrawn() {
- if (!allDrawn) {
- // Number of drawn windows can be less when a window is being relaunched, wait for
- // all windows to be launched and drawn for this token be considered all drawn.
- final int numInteresting = mNumInterestingWindows;
-
- // We must make sure that all present children have been considered (determined by
- // {@link #allDrawnStatesConsidered}) before evaluating whether everything has been
- // drawn.
- if (numInteresting > 0 && allDrawnStatesConsidered()
- && mNumDrawnWindows >= numInteresting && !isRelaunching()) {
- if (DEBUG_VISIBILITY) Slog.v(TAG, "allDrawn: " + this
- + " interesting=" + numInteresting + " drawn=" + mNumDrawnWindows);
- allDrawn = true;
- // Force an additional layout pass where
- // WindowStateAnimator#commitFinishDrawingLocked() will call performShowLocked().
- if (mDisplayContent != null) {
- mDisplayContent.setLayoutNeeded();
- }
- mWmService.mH.obtainMessage(NOTIFY_ACTIVITY_DRAWN, token).sendToTarget();
-
- // Notify the pinned stack upon all windows drawn. If there was an animation in
- // progress then this signal will resume that animation.
- final TaskStack pinnedStack = mDisplayContent.getPinnedStack();
- if (pinnedStack != null) {
- pinnedStack.onAllWindowsDrawn();
- }
- }
- }
- }
-
- // Mostly implemented in ActivityRecord...
- boolean keyDispatchingTimedOut(String reason, int windowPid) {
- return false;
- }
-
- /**
- * Updated this app token tracking states for interesting and drawn windows based on the window.
- *
- * @return Returns true if the input window is considered interesting and drawn while all the
- * windows in this app token where not considered drawn as of the last pass.
- */
- boolean updateDrawnWindowStates(WindowState w) {
- w.setDrawnStateEvaluated(true /*evaluated*/);
-
- if (DEBUG_STARTING_WINDOW_VERBOSE && w == startingWindow) {
- Slog.d(TAG, "updateWindows: starting " + w + " isOnScreen=" + w.isOnScreen()
- + " allDrawn=" + allDrawn + " freezingScreen=" + mFreezingScreen);
- }
-
- if (allDrawn && !mFreezingScreen) {
- return false;
- }
-
- if (mLastTransactionSequence != mWmService.mTransactionSequence) {
- mLastTransactionSequence = mWmService.mTransactionSequence;
- mNumDrawnWindows = 0;
- startingDisplayed = false;
-
- // There is the main base application window, even if it is exiting, wait for it
- mNumInterestingWindows = findMainWindow(false /* includeStartingApp */) != null ? 1 : 0;
- }
-
- final WindowStateAnimator winAnimator = w.mWinAnimator;
-
- boolean isInterestingAndDrawn = false;
-
- if (!allDrawn && w.mightAffectAllDrawn()) {
- if (DEBUG_VISIBILITY || WM_DEBUG_ORIENTATION.isLogToLogcat()) {
- Slog.v(TAG, "Eval win " + w + ": isDrawn=" + w.isDrawnLw()
- + ", isAnimationSet=" + isSelfAnimating());
- if (!w.isDrawnLw()) {
- Slog.v(TAG, "Not displayed: s=" + winAnimator.mSurfaceController
- + " pv=" + w.isVisibleByPolicy()
- + " mDrawState=" + winAnimator.drawStateToString()
- + " ph=" + w.isParentWindowHidden() + " th=" + hiddenRequested
- + " a=" + isSelfAnimating());
- }
- }
-
- if (w != startingWindow) {
- if (w.isInteresting()) {
- // Add non-main window as interesting since the main app has already been added
- if (findMainWindow(false /* includeStartingApp */) != w) {
- mNumInterestingWindows++;
- }
- if (w.isDrawnLw()) {
- mNumDrawnWindows++;
-
- if (DEBUG_VISIBILITY || WM_DEBUG_ORIENTATION.isLogToLogcat()) {
- Slog.v(TAG, "tokenMayBeDrawn: "
- + this + " w=" + w + " numInteresting=" + mNumInterestingWindows
- + " freezingScreen=" + mFreezingScreen
- + " mAppFreezing=" + w.mAppFreezing);
- }
-
- isInterestingAndDrawn = true;
- }
- }
- } else if (w.isDrawnLw()) {
- onStartingWindowDrawn(SystemClock.uptimeMillis());
- startingDisplayed = true;
- }
- }
-
- return isInterestingAndDrawn;
- }
-
- /** Called when the starting window for this container is drawn. */
- private void onStartingWindowDrawn(long timestamp) {
- synchronized (mAtmService.mGlobalLock) {
- mAtmService.mStackSupervisor.getActivityMetricsLogger().notifyStartingWindowDrawn(
- getWindowingMode(), timestamp);
- }
- }
-
- void layoutLetterbox(WindowState winHint) {
- final WindowState w = findMainWindow();
- if (w == null || winHint != null && w != winHint) {
- return;
- }
- final boolean surfaceReady = w.isDrawnLw() // Regular case
- || w.mWinAnimator.mSurfaceDestroyDeferred // The preserved surface is still ready.
- || w.isDragResizeChanged(); // Waiting for relayoutWindow to call preserveSurface.
- final boolean needsLetterbox = surfaceReady && w.isLetterboxedAppWindow() && fillsParent();
- if (needsLetterbox) {
- if (mLetterbox == null) {
- mLetterbox = new Letterbox(() -> makeChildSurface(null),
- mWmService.mTransactionFactory);
- mLetterbox.attachInput(w);
- }
- getPosition(mTmpPoint);
- // Get the bounds of the "space-to-fill". In multi-window mode, the task-level
- // represents this. In fullscreen-mode, the stack does (since the orientation letterbox
- // is also applied to the task).
- Rect spaceToFill = (inMultiWindowMode() || getStack() == null)
- ? getTask().getDisplayedBounds() : getStack().getDisplayedBounds();
- mLetterbox.layout(spaceToFill, w.getFrameLw(), mTmpPoint);
- } else if (mLetterbox != null) {
- mLetterbox.hide();
- }
- }
-
- void updateLetterboxSurface(WindowState winHint) {
- final WindowState w = findMainWindow();
- if (w != winHint && winHint != null && w != null) {
- return;
- }
- layoutLetterbox(winHint);
- if (mLetterbox != null && mLetterbox.needsApplySurfaceChanges()) {
- mLetterbox.applySurfaceChanges(getPendingTransaction());
- }
- }
-
- @Override
- boolean forAllWindows(ToBooleanFunction<WindowState> callback, boolean traverseTopToBottom) {
- // For legacy reasons we process the TaskStack.mExitingAppTokens first in DisplayContent
- // before the non-exiting app tokens. So, we skip the exiting app tokens here.
- // TODO: Investigate if we need to continue to do this or if we can just process them
- // in-order.
- if (mIsExiting && !waitingForReplacement()) {
- return false;
- }
- return forAllWindowsUnchecked(callback, traverseTopToBottom);
- }
-
- @Override
- void forAllAppWindows(Consumer<AppWindowToken> callback) {
- callback.accept(this);
- }
-
- boolean forAllWindowsUnchecked(ToBooleanFunction<WindowState> callback,
- boolean traverseTopToBottom) {
- return super.forAllWindows(callback, traverseTopToBottom);
- }
-
- @Override
- AppWindowToken asAppWindowToken() {
- // I am an app window token!
- return this;
- }
-
- boolean addStartingWindow(String pkg, int theme, CompatibilityInfo compatInfo,
- CharSequence nonLocalizedLabel, int labelRes, int icon, int logo, int windowFlags,
- IBinder transferFrom, boolean newTask, boolean taskSwitch, boolean processRunning,
- boolean allowTaskSnapshot, boolean activityCreated, boolean fromRecents) {
- // If the display is frozen, we won't do anything until the actual window is
- // displayed so there is no reason to put in the starting window.
- if (!okToDisplay()) {
- return false;
- }
-
- if (mStartingData != null) {
- return false;
- }
-
- final WindowState mainWin = findMainWindow();
- if (mainWin != null && mainWin.mWinAnimator.getShown()) {
- // App already has a visible window...why would you want a starting window?
- return false;
- }
-
- final ActivityManager.TaskSnapshot snapshot =
- mWmService.mTaskSnapshotController.getSnapshot(
- getTask().mTaskId, getTask().mUserId,
- false /* restoreFromDisk */, false /* reducedResolution */);
- final int type = getStartingWindowType(newTask, taskSwitch, processRunning,
- allowTaskSnapshot, activityCreated, fromRecents, snapshot);
-
- if (type == STARTING_WINDOW_TYPE_SNAPSHOT) {
- return createSnapshot(snapshot);
- }
-
- // If this is a translucent window, then don't show a starting window -- the current
- // effect (a full-screen opaque starting window that fades away to the real contents
- // when it is ready) does not work for this.
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Checking theme of starting window: 0x%x", theme);
- if (theme != 0) {
- AttributeCache.Entry ent = AttributeCache.instance().get(pkg, theme,
- com.android.internal.R.styleable.Window,
- mWmService.mCurrentUserId);
- if (ent == null) {
- // Whoops! App doesn't exist. Um. Okay. We'll just pretend like we didn't
- // see that.
- return false;
- }
- final boolean windowIsTranslucent = ent.array.getBoolean(
- com.android.internal.R.styleable.Window_windowIsTranslucent, false);
- final boolean windowIsFloating = ent.array.getBoolean(
- com.android.internal.R.styleable.Window_windowIsFloating, false);
- final boolean windowShowWallpaper = ent.array.getBoolean(
- com.android.internal.R.styleable.Window_windowShowWallpaper, false);
- final boolean windowDisableStarting = ent.array.getBoolean(
- com.android.internal.R.styleable.Window_windowDisablePreview, false);
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Translucent=%s Floating=%s ShowWallpaper=%s",
- windowIsTranslucent, windowIsFloating, windowShowWallpaper);
- if (windowIsTranslucent) {
- return false;
- }
- if (windowIsFloating || windowDisableStarting) {
- return false;
- }
- if (windowShowWallpaper) {
- if (getDisplayContent().mWallpaperController
- .getWallpaperTarget() == null) {
- // If this theme is requesting a wallpaper, and the wallpaper
- // is not currently visible, then this effectively serves as
- // an opaque window and our starting window transition animation
- // can still work. We just need to make sure the starting window
- // is also showing the wallpaper.
- windowFlags |= FLAG_SHOW_WALLPAPER;
- } else {
- return false;
- }
- }
- }
-
- if (transferStartingWindow(transferFrom)) {
- return true;
- }
-
- // There is no existing starting window, and we don't want to create a splash screen, so
- // that's it!
- if (type != STARTING_WINDOW_TYPE_SPLASH_SCREEN) {
- return false;
- }
-
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Creating SplashScreenStartingData");
- mStartingData = new SplashScreenStartingData(mWmService, pkg,
- theme, compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags,
- getMergedOverrideConfiguration());
- scheduleAddStartingWindow();
- return true;
- }
-
-
- private boolean createSnapshot(ActivityManager.TaskSnapshot snapshot) {
- if (snapshot == null) {
- return false;
- }
-
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Creating SnapshotStartingData");
- mStartingData = new SnapshotStartingData(mWmService, snapshot);
- scheduleAddStartingWindow();
- return true;
- }
-
- void scheduleAddStartingWindow() {
- // Note: we really want to do sendMessageAtFrontOfQueue() because we
- // want to process the message ASAP, before any other queued
- // messages.
- if (!mWmService.mAnimationHandler.hasCallbacks(mAddStartingWindow)) {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Enqueueing ADD_STARTING");
- mWmService.mAnimationHandler.postAtFrontOfQueue(mAddStartingWindow);
- }
- }
-
- private class AddStartingWindow implements Runnable {
-
- @Override
- public void run() {
- // Can be accessed without holding the global lock
- final StartingData startingData;
- synchronized (mWmService.mGlobalLock) {
- // There can only be one adding request, silly caller!
- mWmService.mAnimationHandler.removeCallbacks(this);
-
- if (mStartingData == null) {
- // Animation has been canceled... do nothing.
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
- "startingData was nulled out before handling"
- + " mAddStartingWindow: %s", AppWindowToken.this);
- return;
- }
- startingData = mStartingData;
- }
-
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Add starting %s: startingData=%s",
- this, startingData);
-
-
- WindowManagerPolicy.StartingSurface surface = null;
- try {
- surface = startingData.createStartingSurface(AppWindowToken.this);
- } catch (Exception e) {
- Slog.w(TAG, "Exception when adding starting window", e);
- }
- if (surface != null) {
- boolean abort = false;
- synchronized (mWmService.mGlobalLock) {
- // If the window was successfully added, then
- // we need to remove it.
- if (removed || mStartingData == null) {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
- "Aborted starting %s: removed=%b startingData=%s",
- AppWindowToken.this, removed, mStartingData);
-
- startingWindow = null;
- mStartingData = null;
- abort = true;
- } else {
- startingSurface = surface;
- }
- if (!abort) {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
- "Added starting %s: startingWindow=%s startingView=%s",
- AppWindowToken.this, startingWindow, startingSurface);
- }
- }
- if (abort) {
- surface.remove();
- }
- } else {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Surface returned was null: %s",
- AppWindowToken.this);
- }
- }
- }
-
- private final AddStartingWindow mAddStartingWindow = new AddStartingWindow();
-
- private int getStartingWindowType(boolean newTask, boolean taskSwitch, boolean processRunning,
- boolean allowTaskSnapshot, boolean activityCreated, boolean fromRecents,
- ActivityManager.TaskSnapshot snapshot) {
- if (getDisplayContent().mAppTransition.getAppTransition()
- == TRANSIT_DOCK_TASK_FROM_RECENTS) {
- // TODO(b/34099271): Remove this statement to add back the starting window and figure
- // out why it causes flickering, the starting window appears over the thumbnail while
- // the docked from recents transition occurs
- return STARTING_WINDOW_TYPE_NONE;
- } else if (newTask || !processRunning || (taskSwitch && !activityCreated)) {
- return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
- } else if (taskSwitch && allowTaskSnapshot) {
- if (mWmService.mLowRamTaskSnapshotsAndRecents) {
- // For low RAM devices, we use the splash screen starting window instead of the
- // task snapshot starting window.
- return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
- }
- return snapshot == null ? STARTING_WINDOW_TYPE_NONE
- : snapshotOrientationSameAsTask(snapshot) || fromRecents
- ? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN;
- } else {
- return STARTING_WINDOW_TYPE_NONE;
- }
- }
-
-
- private boolean snapshotOrientationSameAsTask(ActivityManager.TaskSnapshot snapshot) {
- if (snapshot == null) {
- return false;
- }
- return getTask().getConfiguration().orientation == snapshot.getOrientation();
- }
-
- void removeStartingWindow() {
- if (startingWindow == null) {
- if (mStartingData != null) {
- // Starting window has not been added yet, but it is scheduled to be added.
- // Go ahead and cancel the request.
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Clearing startingData for token=%s", this);
- mStartingData = null;
- }
- return;
- }
-
- final WindowManagerPolicy.StartingSurface surface;
- if (mStartingData != null) {
- surface = startingSurface;
- mStartingData = null;
- startingSurface = null;
- startingWindow = null;
- startingDisplayed = false;
- if (surface == null) {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
- "startingWindow was set but startingSurface==null, couldn't "
- + "remove");
-
- return;
- }
- } else {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW,
- "Tried to remove starting window but startingWindow was null: %s",
- this);
- return;
- }
-
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Schedule remove starting %s startingWindow=%s"
- + " startingView=%s Callers=%s",
- this, startingWindow, startingSurface, Debug.getCallers(5));
-
-
- // Use the same thread to remove the window as we used to add it, as otherwise we end up
- // with things in the view hierarchy being called from different threads.
- mWmService.mAnimationHandler.post(() -> {
- ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Removing startingView=%s", surface);
- try {
- surface.remove();
- } catch (Exception e) {
- Slog.w(TAG_WM, "Exception when removing starting window", e);
- }
- });
- }
-
- @Override
- boolean fillsParent() {
- return occludesParent();
- }
-
- /** Returns true if this activity is opaque and fills the entire space of this task. */
- boolean occludesParent() {
- return mOccludesParent;
- }
-
- boolean setOccludesParent(boolean occludesParent) {
- final boolean changed = occludesParent != mOccludesParent;
- mOccludesParent = occludesParent;
- setMainWindowOpaque(occludesParent);
- mWmService.mWindowPlacerLocked.requestTraversal();
- return changed;
- }
-
- void setMainWindowOpaque(boolean isOpaque) {
- final WindowState win = findMainWindow();
- if (win == null) {
- return;
- }
- isOpaque = isOpaque & !PixelFormat.formatHasAlpha(win.getAttrs().format);
- win.mWinAnimator.setOpaqueLocked(isOpaque);
- }
-
- boolean containsDismissKeyguardWindow() {
- // Window state is transient during relaunch. We are not guaranteed to be frozen during the
- // entirety of the relaunch.
- if (isRelaunching()) {
- return mLastContainsDismissKeyguardWindow;
- }
-
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- if ((mChildren.get(i).mAttrs.flags & FLAG_DISMISS_KEYGUARD) != 0) {
- return true;
- }
- }
- return false;
- }
-
- boolean containsShowWhenLockedWindow() {
- // When we are relaunching, it is possible for us to be unfrozen before our previous
- // windows have been added back. Using the cached value ensures that our previous
- // showWhenLocked preference is honored until relaunching is complete.
- if (isRelaunching()) {
- return mLastContainsShowWhenLockedWindow;
- }
-
- for (int i = mChildren.size() - 1; i >= 0; i--) {
- if ((mChildren.get(i).mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {
- return true;
- }
- }
-
- return false;
- }
-
- void setShowWhenLocked(boolean showWhenLocked) {
- mShowWhenLocked = showWhenLocked;
- mAtmService.mRootActivityContainer.ensureActivitiesVisible(null /* starting */,
- 0 /* configChanges */, false /* preserveWindows */);
- }
-
- void setInheritShowWhenLocked(boolean inheritShowWhenLocked) {
- mInheritShownWhenLocked = inheritShowWhenLocked;
- mAtmService.mRootActivityContainer.ensureActivitiesVisible(null /* starting */,
- 0 /* configChanges */, false /* preserveWindows */);
- }
-
- /**
- * @return {@code true} if the activity windowing mode is not
- * {@link android.app.WindowConfiguration#WINDOWING_MODE_PINNED} and a) activity
- * contains windows that have {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED} set or if the
- * activity has set {@link #mShowWhenLocked}, or b) if the activity has set
- * {@link #mInheritShownWhenLocked} and the activity behind this satisfies the
- * conditions a) above.
- * Multi-windowing mode will be exited if {@code true} is returned.
- */
- boolean canShowWhenLocked() {
- if (!inPinnedWindowingMode() && (mShowWhenLocked || containsShowWhenLockedWindow())) {
- return true;
- } else if (mInheritShownWhenLocked) {
- final AppWindowToken r = getActivityBelow();
- return r != null && !r.inPinnedWindowingMode() && (r.mShowWhenLocked
- || r.containsShowWhenLockedWindow());
- } else {
- return false;
- }
- }
-
- /**
- * @return an {@link ActivityRecord} of the activity below this activity, or {@code null} if no
- * such activity exists.
- */
- @Nullable
- private AppWindowToken getActivityBelow() {
- final Task task = getTask();
- final int pos = task.mChildren.indexOf(this);
- if (pos == -1) {
- throw new IllegalStateException("Activity not found in its task");
- }
- return pos == 0 ? null : task.getChildAt(pos - 1);
- }
-
- void setTurnScreenOn(boolean turnScreenOn) {
- mTurnScreenOn = turnScreenOn;
- }
-
- /** Mostly implemented in ActivityRecord. */
- boolean canTurnScreenOn() {
- return mTurnScreenOn;
- }
-
- boolean getTurnScreenOnFlag() {
- return mTurnScreenOn;
- }
-
- void checkKeyguardFlagsChanged() {
- final boolean containsDismissKeyguard = containsDismissKeyguardWindow();
- final boolean containsShowWhenLocked = containsShowWhenLockedWindow();
- if (containsDismissKeyguard != mLastContainsDismissKeyguardWindow
- || containsShowWhenLocked != mLastContainsShowWhenLockedWindow) {
- mWmService.notifyKeyguardFlagsChanged(null /* callback */,
- getDisplayContent().getDisplayId());
- }
- mLastContainsDismissKeyguardWindow = containsDismissKeyguard;
- mLastContainsShowWhenLockedWindow = containsShowWhenLocked;
- }
-
- WindowState getImeTargetBelowWindow(WindowState w) {
- final int index = mChildren.indexOf(w);
- if (index > 0) {
- final WindowState target = mChildren.get(index - 1);
- if (target.canBeImeTarget()) {
- return target;
- }
- }
- return null;
- }
-
- WindowState getHighestAnimLayerWindow(WindowState currentTarget) {
- WindowState candidate = null;
- for (int i = mChildren.indexOf(currentTarget); i >= 0; i--) {
- final WindowState w = mChildren.get(i);
- if (w.mRemoved) {
- continue;
- }
- if (candidate == null) {
- candidate = w;
- }
- }
- return candidate;
- }
-
- /**
- * See {@link Activity#setDisablePreviewScreenshots}.
- */
- void setDisablePreviewScreenshots(boolean disable) {
- mDisablePreviewScreenshots = disable;
- }
-
- /**
- * Sets whether the current launch can turn the screen on.
- * @see #currentLaunchCanTurnScreenOn()
- */
- void setCurrentLaunchCanTurnScreenOn(boolean currentLaunchCanTurnScreenOn) {
- mCurrentLaunchCanTurnScreenOn = currentLaunchCanTurnScreenOn;
- }
-
- /**
- * Indicates whether the current launch can turn the screen on. This is to prevent multiple
- * relayouts from turning the screen back on. The screen should only turn on at most
- * once per activity resume.
- * <p>
- * Note this flag is only meaningful when {@link WindowManager.LayoutParams#FLAG_TURN_SCREEN_ON}
- * or {@link ActivityRecord#canTurnScreenOn} is set.
- *
- * @return {@code true} if the activity is ready to turn on the screen.
- */
- boolean currentLaunchCanTurnScreenOn() {
- return mCurrentLaunchCanTurnScreenOn;
- }
-
- /**
- * Retrieves whether we'd like to generate a snapshot that's based solely on the theme. This is
- * the case when preview screenshots are disabled {@link #setDisablePreviewScreenshots} or when
- * we can't take a snapshot for other reasons, for example, if we have a secure window.
- *
- * @return True if we need to generate an app theme snapshot, false if we'd like to take a real
- * screenshot.
- */
- boolean shouldUseAppThemeSnapshot() {
- return mDisablePreviewScreenshots || forAllWindows(w -> (w.mAttrs.flags & FLAG_SECURE) != 0,
- true /* topToBottom */);
- }
-
- SurfaceControl getAppAnimationLayer() {
- return getAppAnimationLayer(isActivityTypeHome() ? ANIMATION_LAYER_HOME
- : needsZBoost() ? ANIMATION_LAYER_BOOSTED
- : ANIMATION_LAYER_STANDARD);
- }
-
- @Override
- public SurfaceControl getAnimationLeashParent() {
- // For transitions in the pinned stack (menu activity) we just let them occur as a child
- // of the pinned stack.
- // All normal app transitions take place in an animation layer which is below the pinned
- // stack but may be above the parent stacks of the given animating apps by default. When
- // a new hierarchical animation is enabled, we just let them occur as a child of the parent
- // stack, i.e. the hierarchy of the surfaces is unchanged.
- if (inPinnedWindowingMode()) {
- return getStack().getSurfaceControl();
- } else if (WindowManagerService.sHierarchicalAnimations) {
- return super.getAnimationLeashParent();
- } else {
- return getAppAnimationLayer();
- }
- }
-
-
- @VisibleForTesting
- boolean shouldAnimate(int transit) {
- final boolean isSplitScreenPrimary =
- getWindowingMode() == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
- final boolean allowSplitScreenPrimaryAnimation = transit != TRANSIT_WALLPAPER_OPEN;
-
- // Don't animate while the task runs recents animation but only if we are in the mode
- // where we cancel with deferred screenshot, which means that the controller has
- // transformed the task.
- final RecentsAnimationController controller = mWmService.getRecentsAnimationController();
- if (controller != null && controller.isAnimatingTask(getTask())
- && controller.shouldDeferCancelUntilNextTransition()) {
- return false;
- }
-
- // We animate always if it's not split screen primary, and only some special cases in split
- // screen primary because it causes issues with stack clipping when we run an un-minimize
- // animation at the same time.
- return !isSplitScreenPrimary || allowSplitScreenPrimaryAnimation;
- }
-
- /**
- * Creates a layer to apply crop to an animation.
- */
- private SurfaceControl createAnimationBoundsLayer(Transaction t) {
- ProtoLog.i(WM_DEBUG_APP_TRANSITIONS_ANIM, "Creating animation bounds layer");
- final SurfaceControl.Builder builder = makeAnimationLeash()
- .setParent(getAnimationLeashParent())
- .setName(getSurfaceControl() + " - animation-bounds");
- final SurfaceControl boundsLayer = builder.build();
- t.show(boundsLayer);
- return boundsLayer;
- }
-
- @Override
- Rect getDisplayedBounds() {
- final Task task = getTask();
- if (task != null) {
- final Rect overrideDisplayedBounds = task.getOverrideDisplayedBounds();
- if (!overrideDisplayedBounds.isEmpty()) {
- return overrideDisplayedBounds;
- }
- }
- return getBounds();
- }
-
- @VisibleForTesting
- Rect getAnimationBounds(int appStackClipMode) {
- if (appStackClipMode == STACK_CLIP_BEFORE_ANIM && getStack() != null) {
- // Using the stack bounds here effectively applies the clipping before animation.
- return getStack().getBounds();
- }
- // Use task-bounds if available so that activity-level letterbox (maxAspectRatio) is
- // included in the animation.
- return getTask() != null ? getTask().getBounds() : getBounds();
- }
-
- boolean applyAnimationLocked(WindowManager.LayoutParams lp, int transit, boolean enter,
- boolean isVoiceInteraction) {
-
- if (mWmService.mDisableTransitionAnimation || !shouldAnimate(transit)) {
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS_ANIM,
- "applyAnimation: transition animation is disabled or skipped. "
- + "atoken=%s", this);
- cancelAnimation();
- return false;
- }
-
- // Only apply an animation if the display isn't frozen. If it is frozen, there is no reason
- // to animate and it can cause strange artifacts when we unfreeze the display if some
- // different animation is running.
- Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "AWT#applyAnimationLocked");
- if (okToAnimate()) {
- final AnimationAdapter adapter;
- AnimationAdapter thumbnailAdapter = null;
-
- final int appStackClipMode =
- getDisplayContent().mAppTransition.getAppStackClipMode();
-
- // Separate position and size for use in animators.
- mTmpRect.set(getAnimationBounds(appStackClipMode));
- mTmpPoint.set(mTmpRect.left, mTmpRect.top);
- mTmpRect.offsetTo(0, 0);
-
- final boolean isChanging = AppTransition.isChangeTransit(transit) && enter
- && getDisplayContent().mChangingApps.contains(this);
-
- // Delaying animation start isn't compatible with remote animations at all.
- if (getDisplayContent().mAppTransition.getRemoteAnimationController() != null
- && !mSurfaceAnimator.isAnimationStartDelayed()) {
- RemoteAnimationRecord adapters =
- getDisplayContent().mAppTransition.getRemoteAnimationController()
- .createRemoteAnimationRecord(this, mTmpPoint, mTmpRect,
- (isChanging ? mTransitStartRect : null));
- adapter = adapters.mAdapter;
- thumbnailAdapter = adapters.mThumbnailAdapter;
- } else if (isChanging) {
- final float durationScale = mWmService.getTransitionAnimationScaleLocked();
- mTmpRect.offsetTo(mTmpPoint.x, mTmpPoint.y);
- adapter = new LocalAnimationAdapter(
- new WindowChangeAnimationSpec(mTransitStartRect, mTmpRect,
- getDisplayContent().getDisplayInfo(), durationScale,
- true /* isAppAnimation */, false /* isThumbnail */),
- mWmService.mSurfaceAnimationRunner);
- if (mThumbnail != null) {
- thumbnailAdapter = new LocalAnimationAdapter(
- new WindowChangeAnimationSpec(mTransitStartRect, mTmpRect,
- getDisplayContent().getDisplayInfo(), durationScale,
- true /* isAppAnimation */, true /* isThumbnail */),
- mWmService.mSurfaceAnimationRunner);
- }
- mTransit = transit;
- mTransitFlags = getDisplayContent().mAppTransition.getTransitFlags();
- } else {
- mNeedsAnimationBoundsLayer = (appStackClipMode == STACK_CLIP_AFTER_ANIM);
-
- final Animation a = loadAnimation(lp, transit, enter, isVoiceInteraction);
- if (a != null) {
- // Only apply corner radius to animation if we're not in multi window mode.
- // We don't want rounded corners when in pip or split screen.
- final float windowCornerRadius = !inMultiWindowMode()
- ? getDisplayContent().getWindowCornerRadius()
- : 0;
- adapter = new LocalAnimationAdapter(
- new WindowAnimationSpec(a, mTmpPoint, mTmpRect,
- getDisplayContent().mAppTransition.canSkipFirstFrame(),
- appStackClipMode,
- true /* isAppAnimation */,
- windowCornerRadius),
- mWmService.mSurfaceAnimationRunner);
- if (a.getZAdjustment() == Animation.ZORDER_TOP) {
- mNeedsZBoost = true;
- }
- mTransit = transit;
- mTransitFlags = getDisplayContent().mAppTransition.getTransitFlags();
- } else {
- adapter = null;
- }
- }
- if (adapter != null) {
- startAnimation(getPendingTransaction(), adapter, !isVisible());
- if (adapter.getShowWallpaper()) {
- mDisplayContent.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;
- }
- if (thumbnailAdapter != null) {
- mThumbnail.startAnimation(
- getPendingTransaction(), thumbnailAdapter, !isVisible());
- }
- }
- } else {
- cancelAnimation();
- }
- Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
-
- return isReallyAnimating();
- }
-
- private Animation loadAnimation(WindowManager.LayoutParams lp, int transit, boolean enter,
- boolean isVoiceInteraction) {
- final DisplayContent displayContent = getTask().getDisplayContent();
- final DisplayInfo displayInfo = displayContent.getDisplayInfo();
- final int width = displayInfo.appWidth;
- final int height = displayInfo.appHeight;
- ProtoLog.v(WM_DEBUG_APP_TRANSITIONS_ANIM,
- "applyAnimation: atoken=%s", this);
-
- // Determine the visible rect to calculate the thumbnail clip
- final WindowState win = findMainWindow();
- final Rect frame = new Rect(0, 0, width, height);
- final Rect displayFrame = new Rect(0, 0,
- displayInfo.logicalWidth, displayInfo.logicalHeight);
- final Rect insets = new Rect();
- final Rect stableInsets = new Rect();
- Rect surfaceInsets = null;
- final boolean freeform = win != null && win.inFreeformWindowingMode();
- if (win != null) {
- // Containing frame will usually cover the whole screen, including dialog windows.
- // For freeform workspace windows it will not cover the whole screen and it also
- // won't exactly match the final freeform window frame (e.g. when overlapping with
- // the status bar). In that case we need to use the final frame.
- if (freeform) {
- frame.set(win.getFrameLw());
- } else if (win.isLetterboxedAppWindow()) {
- frame.set(getTask().getBounds());
- } else if (win.isDockedResizing()) {
- // If we are animating while docked resizing, then use the stack bounds as the
- // animation target (which will be different than the task bounds)
- frame.set(getTask().getParent().getBounds());
- } else {
- frame.set(win.getContainingFrame());
- }
- surfaceInsets = win.getAttrs().surfaceInsets;
- // XXX(b/72757033): These are insets relative to the window frame, but we're really
- // interested in the insets relative to the frame we chose in the if-blocks above.
- win.getContentInsets(insets);
- win.getStableInsets(stableInsets);
- }
-
- if (mLaunchTaskBehind) {
- // Differentiate the two animations. This one which is briefly on the screen
- // gets the !enter animation, and the other activity which remains on the
- // screen gets the enter animation. Both appear in the mOpeningApps set.
- enter = false;
- }
- ProtoLog.d(WM_DEBUG_APP_TRANSITIONS,
- "Loading animation for app transition. transit=%s enter=%b frame=%s insets=%s "
- + "surfaceInsets=%s",
- AppTransition.appTransitionToString(transit), enter, frame, insets, surfaceInsets);
- final Configuration displayConfig = displayContent.getConfiguration();
- final Animation a = getDisplayContent().mAppTransition.loadAnimation(lp, transit, enter,
- displayConfig.uiMode, displayConfig.orientation, frame, displayFrame, insets,
- surfaceInsets, stableInsets, isVoiceInteraction, freeform, getTask().mTaskId);
- if (a != null) {
- if (DEBUG_ANIM) logWithStack(TAG, "Loaded animation " + a + " for " + this);
- final int containingWidth = frame.width();
- final int containingHeight = frame.height();
- a.initialize(containingWidth, containingHeight, width, height);
- a.scaleCurrentDuration(mWmService.getTransitionAnimationScaleLocked());
- }
- return a;
- }
-
- @Override
- public boolean shouldDeferAnimationFinish(Runnable endDeferFinishCallback) {
- return mAnimatingAppWindowTokenRegistry != null
- && mAnimatingAppWindowTokenRegistry.notifyAboutToFinish(
- this, endDeferFinishCallback);
- }
-
- @Override
- public void onAnimationLeashLost(Transaction t) {
- super.onAnimationLeashLost(t);
- if (mAnimationBoundsLayer != null) {
- t.remove(mAnimationBoundsLayer);
- mAnimationBoundsLayer = null;
- }
-
- if (mAnimatingAppWindowTokenRegistry != null) {
- mAnimatingAppWindowTokenRegistry.notifyFinished(this);
- }
- }
-
- @Override
- protected void setLayer(Transaction t, int layer) {
- if (!mSurfaceAnimator.hasLeash()) {
- t.setLayer(mSurfaceControl, layer);
- }
- }
-
- @Override
- protected void setRelativeLayer(Transaction t, SurfaceControl relativeTo, int layer) {
- if (!mSurfaceAnimator.hasLeash()) {
- t.setRelativeLayer(mSurfaceControl, relativeTo, layer);
- }
- }
-
- @Override
- protected void reparentSurfaceControl(Transaction t, SurfaceControl newParent) {
- if (!mSurfaceAnimator.hasLeash()) {
- t.reparent(mSurfaceControl, newParent);
- }
- }
-
- @Override
- public void onAnimationLeashCreated(Transaction t, SurfaceControl leash) {
- // The leash is parented to the animation layer. We need to preserve the z-order by using
- // the prefix order index, but we boost if necessary.
- int layer = 0;
- if (!inPinnedWindowingMode()) {
- layer = getPrefixOrderIndex();
- } else {
- // Pinned stacks have animations take place within themselves rather than an animation
- // layer so we need to preserve the order relative to the stack (e.g. the order of our
- // task/parent).
- layer = getParent().getPrefixOrderIndex();
- }
-
- if (mNeedsZBoost) {
- layer += Z_BOOST_BASE;
- }
- if (!mNeedsAnimationBoundsLayer) {
- t.setLayer(leash, layer);
- }
-
- final DisplayContent dc = getDisplayContent();
- dc.assignStackOrdering();
-
- if (leash == mTransitChangeLeash) {
- // This is a temporary state so skip any animation notifications
- return;
- } else if (mTransitChangeLeash != null) {
- // unparent mTransitChangeLeash for clean-up
- clearChangeLeash(t, false /* cancel */);
- }
-
- if (mAnimatingAppWindowTokenRegistry != null) {
- mAnimatingAppWindowTokenRegistry.notifyStarting(this);
- }
-
- // If the animation needs to be cropped then an animation bounds layer is created as a child
- // of the pinned stack or animation layer. The leash is then reparented to this new layer.
- if (mNeedsAnimationBoundsLayer) {
- mTmpRect.setEmpty();
- final Task task = getTask();
- if (getDisplayContent().mAppTransitionController.isTransitWithinTask(
- getTransit(), task)) {
- task.getBounds(mTmpRect);
- } else {
- final TaskStack stack = getStack();
- if (stack == null) {
- return;
- }
- // Set clip rect to stack bounds.
- stack.getBounds(mTmpRect);
- }
- mAnimationBoundsLayer = createAnimationBoundsLayer(t);
-
- // Crop to stack bounds.
- t.setWindowCrop(mAnimationBoundsLayer, mTmpRect);
- t.setLayer(mAnimationBoundsLayer, layer);
-
- // Reparent leash to animation bounds layer.
- t.reparent(leash, mAnimationBoundsLayer);
- }
- }
-
- /**
- * This must be called while inside a transaction.
- */
- void showAllWindowsLocked() {
- forAllWindows(windowState -> {
- if (DEBUG_VISIBILITY) Slog.v(TAG, "performing show on: " + windowState);
- windowState.performShowLocked();
- }, false /* traverseTopToBottom */);
- }
-
- @Override
- protected void onAnimationFinished() {
- super.onAnimationFinished();
-
- Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "AWT#onAnimationFinished");
- mTransit = TRANSIT_UNSET;
- mTransitFlags = 0;
- mNeedsZBoost = false;
- mNeedsAnimationBoundsLayer = false;
-
- setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM | FINISH_LAYOUT_REDO_WALLPAPER,
- "AppWindowToken");
-
- clearThumbnail();
- setClientHidden(isHidden() && hiddenRequested);
-
- getDisplayContent().computeImeTargetIfNeeded(this);
-
- if (DEBUG_ANIM) Slog.v(TAG, "Animation done in " + this
- + ": reportedVisible=" + reportedVisible
- + " okToDisplay=" + okToDisplay()
- + " okToAnimate=" + okToAnimate()
- + " startingDisplayed=" + startingDisplayed);
-
- // clean up thumbnail window
- if (mThumbnail != null) {
- mThumbnail.destroy();
- mThumbnail = null;
- }
-
- // WindowState.onExitAnimationDone might modify the children list, so make a copy and then
- // traverse the copy.
- final ArrayList<WindowState> children = new ArrayList<>(mChildren);
- children.forEach(WindowState::onExitAnimationDone);
-
- getDisplayContent().mAppTransition.notifyAppTransitionFinishedLocked(token);
- scheduleAnimation();
-
- if (mAtmService.mRootActivityContainer.allResumedActivitiesIdle()
- || mAtmService.mStackSupervisor.isStoppingNoHistoryActivity()) {
- // If all activities are already idle or there is an activity that must be
- // stopped immediately after visible, then we now need to make sure we perform
- // the full stop of this activity. This is because we won't do that while they are still
- // waiting for the animation to finish.
- if (mAtmService.mStackSupervisor.mStoppingActivities.contains(this)) {
- mAtmService.mStackSupervisor.scheduleIdleLocked();
- }
- } else {
- // Instead of doing the full stop routine here, let's just hide any activities
- // we now can, and let them stop when the normal idle happens.
- mAtmService.mStackSupervisor.processStoppingActivitiesLocked(null /* idleActivity */,
- false /* remove */, true /* processPausingActivities */);
- }
- Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
- }
-
- @Override
- boolean isAppAnimating() {
- return isSelfAnimating();
- }
-
- @Override
- boolean isSelfAnimating() {
- // If we are about to start a transition, we also need to be considered animating.
- return isWaitingForTransitionStart() || isReallyAnimating();
- }
-
- /**
- * @return True if and only if we are actually running an animation. Note that
- * {@link #isSelfAnimating} also returns true if we are waiting for an animation to
- * start.
- */
- private boolean isReallyAnimating() {
- return super.isSelfAnimating();
- }
-
- /**
- * @param cancel {@code true} if clearing the leash due to cancelling instead of transferring
- * to another leash.
- */
- private void clearChangeLeash(Transaction t, boolean cancel) {
- if (mTransitChangeLeash == null) {
- return;
- }
- if (cancel) {
- clearThumbnail();
- SurfaceControl sc = getSurfaceControl();
- SurfaceControl parentSc = getParentSurfaceControl();
- // Don't reparent if surface is getting destroyed
- if (parentSc != null && sc != null) {
- t.reparent(sc, getParentSurfaceControl());
- }
- }
- t.hide(mTransitChangeLeash);
- t.remove(mTransitChangeLeash);
- mTransitChangeLeash = null;
- if (cancel) {
- onAnimationLeashLost(t);
- }
- }
-
- @Override
- void cancelAnimation() {
- cancelAnimationOnly();
- clearThumbnail();
- clearChangeLeash(getPendingTransaction(), true /* cancel */);
- }
-
- /**
- * This only cancels the animation. It doesn't do other teardown like cleaning-up thumbnail
- * or interim leashes.
- * <p>
- * Used when canceling in preparation for starting a new animation.
- */
- void cancelAnimationOnly() {
- super.cancelAnimation();
- }
-
- boolean isWaitingForTransitionStart() {
- final DisplayContent dc = getDisplayContent();
- // TODO: Test for null can be removed once unification is done.
- if (dc == null) return false;
- return dc.mAppTransition.isTransitionSet()
- && (dc.mOpeningApps.contains(this)
- || dc.mClosingApps.contains(this)
- || dc.mChangingApps.contains(this));
- }
-
- public int getTransit() {
- return mTransit;
- }
-
- int getTransitFlags() {
- return mTransitFlags;
- }
-
- void attachThumbnailAnimation() {
- if (!isReallyAnimating()) {
- return;
- }
- final int taskId = getTask().mTaskId;
- final GraphicBuffer thumbnailHeader =
- getDisplayContent().mAppTransition.getAppTransitionThumbnailHeader(taskId);
- if (thumbnailHeader == null) {
- ProtoLog.d(WM_DEBUG_APP_TRANSITIONS, "No thumbnail header bitmap for: %d", taskId);
- return;
- }
- clearThumbnail();
- mThumbnail = new AppWindowThumbnail(mWmService.mSurfaceFactory, getPendingTransaction(),
- this, thumbnailHeader);
- mThumbnail.startAnimation(getPendingTransaction(), loadThumbnailAnimation(thumbnailHeader));
- }
-
- /**
- * Attaches a surface with a thumbnail for the
- * {@link android.app.ActivityOptions#ANIM_OPEN_CROSS_PROFILE_APPS} animation.
- */
- void attachCrossProfileAppsThumbnailAnimation() {
- if (!isReallyAnimating()) {
- return;
- }
- clearThumbnail();
-
- final WindowState win = findMainWindow();
- if (win == null) {
- return;
- }
- final Rect frame = win.getFrameLw();
- final int thumbnailDrawableRes = getTask().mUserId == mWmService.mCurrentUserId
- ? R.drawable.ic_account_circle
- : R.drawable.ic_corp_badge;
- final GraphicBuffer thumbnail =
- getDisplayContent().mAppTransition
- .createCrossProfileAppsThumbnail(thumbnailDrawableRes, frame);
- if (thumbnail == null) {
- return;
- }
- mThumbnail = new AppWindowThumbnail(mWmService.mSurfaceFactory,
- getPendingTransaction(), this, thumbnail);
- final Animation animation =
- getDisplayContent().mAppTransition.createCrossProfileAppsThumbnailAnimationLocked(
- win.getFrameLw());
- mThumbnail.startAnimation(getPendingTransaction(), animation, new Point(frame.left,
- frame.top));
- }
-
- private Animation loadThumbnailAnimation(GraphicBuffer thumbnailHeader) {
- final DisplayInfo displayInfo = mDisplayContent.getDisplayInfo();
-
- // If this is a multi-window scenario, we use the windows frame as
- // destination of the thumbnail header animation. If this is a full screen
- // window scenario, we use the whole display as the target.
- WindowState win = findMainWindow();
- Rect appRect = win != null ? win.getContentFrameLw() :
- new Rect(0, 0, displayInfo.appWidth, displayInfo.appHeight);
- final Rect insets = win != null ? win.getContentInsets() : null;
- final Configuration displayConfig = mDisplayContent.getConfiguration();
- return getDisplayContent().mAppTransition.createThumbnailAspectScaleAnimationLocked(
- appRect, insets, thumbnailHeader, getTask().mTaskId, displayConfig.uiMode,
- displayConfig.orientation);
- }
-
- private void clearThumbnail() {
- if (mThumbnail == null) {
- return;
- }
- mThumbnail.destroy();
- mThumbnail = null;
- }
-
- void registerRemoteAnimations(RemoteAnimationDefinition definition) {
- mRemoteAnimationDefinition = definition;
- }
-
- RemoteAnimationDefinition getRemoteAnimationDefinition() {
- return mRemoteAnimationDefinition;
- }
-
- @Override
- void dump(PrintWriter pw, String prefix, boolean dumpAll) {
- super.dump(pw, prefix, dumpAll);
- if (appToken != null) {
- pw.println(prefix + "app=true mVoiceInteraction=" + mVoiceInteraction);
- }
- pw.println(prefix + "component=" + mActivityComponent.flattenToShortString());
- pw.print(prefix); pw.print("task="); pw.println(getTask());
- pw.print(prefix); pw.print(" mOccludesParent="); pw.print(mOccludesParent);
- pw.print(" mOrientation="); pw.println(mOrientation);
- pw.println(prefix + "hiddenRequested=" + hiddenRequested + " mClientHidden=" + mClientHidden
- + ((mDeferHidingClient) ? " mDeferHidingClient=" + mDeferHidingClient : "")
- + " reportedDrawn=" + reportedDrawn + " reportedVisible=" + reportedVisible);
- if (paused) {
- pw.print(prefix); pw.print("paused="); pw.println(paused);
- }
- if (mAppStopped) {
- pw.print(prefix); pw.print("mAppStopped="); pw.println(mAppStopped);
- }
- if (mNumInterestingWindows != 0 || mNumDrawnWindows != 0
- || allDrawn || mLastAllDrawn) {
- pw.print(prefix); pw.print("mNumInterestingWindows=");
- pw.print(mNumInterestingWindows);
- pw.print(" mNumDrawnWindows="); pw.print(mNumDrawnWindows);
- pw.print(" inPendingTransaction="); pw.print(inPendingTransaction);
- pw.print(" allDrawn="); pw.print(allDrawn);
- pw.print(" lastAllDrawn="); pw.print(mLastAllDrawn);
- pw.println(")");
- }
- if (inPendingTransaction) {
- pw.print(prefix); pw.print("inPendingTransaction=");
- pw.println(inPendingTransaction);
- }
- if (mStartingData != null || removed || firstWindowDrawn || mIsExiting) {
- pw.print(prefix); pw.print("startingData="); pw.print(mStartingData);
- pw.print(" removed="); pw.print(removed);
- pw.print(" firstWindowDrawn="); pw.print(firstWindowDrawn);
- pw.print(" mIsExiting="); pw.println(mIsExiting);
- }
- if (startingWindow != null || startingSurface != null
- || startingDisplayed || startingMoved || mHiddenSetFromTransferredStartingWindow) {
- pw.print(prefix); pw.print("startingWindow="); pw.print(startingWindow);
- pw.print(" startingSurface="); pw.print(startingSurface);
- pw.print(" startingDisplayed="); pw.print(startingDisplayed);
- pw.print(" startingMoved="); pw.print(startingMoved);
- pw.println(" mHiddenSetFromTransferredStartingWindow="
- + mHiddenSetFromTransferredStartingWindow);
- }
- if (!mFrozenBounds.isEmpty()) {
- pw.print(prefix); pw.print("mFrozenBounds="); pw.println(mFrozenBounds);
- pw.print(prefix); pw.print("mFrozenMergedConfig="); pw.println(mFrozenMergedConfig);
- }
- if (mPendingRelaunchCount != 0) {
- pw.print(prefix); pw.print("mPendingRelaunchCount="); pw.println(mPendingRelaunchCount);
- }
- if (mSizeCompatScale != 1f || mSizeCompatBounds != null) {
- pw.println(prefix + "mSizeCompatScale=" + mSizeCompatScale + " mSizeCompatBounds="
- + mSizeCompatBounds);
- }
- if (mRemovingFromDisplay) {
- pw.println(prefix + "mRemovingFromDisplay=" + mRemovingFromDisplay);
- }
- }
-
- @Override
- void setHidden(boolean hidden) {
- super.setHidden(hidden);
- scheduleAnimation();
- }
-
- @Override
- void prepareSurfaces() {
- // isSelfAnimating also returns true when we are about to start a transition, so we need
- // to check super here.
- final boolean reallyAnimating = super.isSelfAnimating();
- final boolean show = !isHidden() || reallyAnimating;
-
- if (mSurfaceControl != null) {
- if (show && !mLastSurfaceShowing) {
- getPendingTransaction().show(mSurfaceControl);
- } else if (!show && mLastSurfaceShowing) {
- getPendingTransaction().hide(mSurfaceControl);
- }
- }
- if (mThumbnail != null) {
- mThumbnail.setShowing(getPendingTransaction(), show);
- }
- mLastSurfaceShowing = show;
- super.prepareSurfaces();
- }
-
- /**
- * @return Whether our {@link #getSurfaceControl} is currently showing.
- */
- boolean isSurfaceShowing() {
- return mLastSurfaceShowing;
- }
-
- boolean isFreezingScreen() {
- return mFreezingScreen;
- }
-
- @Override
- boolean needsZBoost() {
- return mNeedsZBoost || super.needsZBoost();
- }
-
- @CallSuper
- @Override
- public void writeToProto(ProtoOutputStream proto, long fieldId,
- @WindowTraceLogLevel int logLevel) {
- // Critical log level logs only visible elements to mitigate performance overheard
- if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
- return;
- }
-
- final long token = proto.start(fieldId);
- writeNameToProto(proto, NAME);
- super.writeToProto(proto, WINDOW_TOKEN, logLevel);
- proto.write(LAST_SURFACE_SHOWING, mLastSurfaceShowing);
- proto.write(IS_WAITING_FOR_TRANSITION_START, isWaitingForTransitionStart());
- proto.write(IS_REALLY_ANIMATING, isReallyAnimating());
- if (mThumbnail != null){
- mThumbnail.writeToProto(proto, THUMBNAIL);
- }
- proto.write(FILLS_PARENT, mOccludesParent);
- proto.write(APP_STOPPED, mAppStopped);
- proto.write(HIDDEN_REQUESTED, hiddenRequested);
- proto.write(CLIENT_HIDDEN, mClientHidden);
- proto.write(DEFER_HIDING_CLIENT, mDeferHidingClient);
- proto.write(REPORTED_DRAWN, reportedDrawn);
- proto.write(REPORTED_VISIBLE, reportedVisible);
- proto.write(NUM_INTERESTING_WINDOWS, mNumInterestingWindows);
- proto.write(NUM_DRAWN_WINDOWS, mNumDrawnWindows);
- proto.write(ALL_DRAWN, allDrawn);
- proto.write(LAST_ALL_DRAWN, mLastAllDrawn);
- proto.write(REMOVED, removed);
- if (startingWindow != null) {
- startingWindow.writeIdentifierToProto(proto, STARTING_WINDOW);
- }
- proto.write(STARTING_DISPLAYED, startingDisplayed);
- proto.write(STARTING_MOVED, startingMoved);
- proto.write(HIDDEN_SET_FROM_TRANSFERRED_STARTING_WINDOW,
- mHiddenSetFromTransferredStartingWindow);
- for (Rect bounds : mFrozenBounds) {
- bounds.writeToProto(proto, FROZEN_BOUNDS);
- }
- proto.end(token);
- }
-
- void writeNameToProto(ProtoOutputStream proto, long fieldId) {
- if (appToken != null) {
- proto.write(fieldId, appToken.getName());
- }
- }
-
- void writeIdentifierToProto(ProtoOutputStream proto, long fieldId) {
- final long token = proto.start(fieldId);
- proto.write(HASH_CODE, System.identityHashCode(this));
- proto.write(USER_ID, mUserId);
- proto.write(TITLE, ((ActivityRecord) this).intent.getComponent().flattenToShortString());
- proto.end(token);
- }
-
- Rect getLetterboxInsets() {
- if (mLetterbox != null) {
- return mLetterbox.getInsets();
- } else {
- return new Rect();
- }
- }
-
- /** Gets the inner bounds of letterbox. The bounds will be empty if there is no letterbox. */
- void getLetterboxInnerBounds(Rect outBounds) {
- if (mLetterbox != null) {
- outBounds.set(mLetterbox.getInnerFrame());
- } else {
- outBounds.setEmpty();
- }
- }
-
- /**
- * @return {@code true} if there is a letterbox and any part of that letterbox overlaps with
- * the given {@code rect}.
- */
- boolean isLetterboxOverlappingWith(Rect rect) {
- return mLetterbox != null && mLetterbox.isOverlappingWith(rect);
- }
-
- /**
- * Sets if this AWT is in the process of closing or entering PIP.
- * {@link #mWillCloseOrEnterPip}}
- */
- void setWillCloseOrEnterPip(boolean willCloseOrEnterPip) {
- mWillCloseOrEnterPip = willCloseOrEnterPip;
- }
-
- /**
- * Returns whether this AWT is considered closing. Conditions are either
- * 1. Is this app animating and was requested to be hidden
- * 2. App is delayed closing since it might enter PIP.
- */
- boolean isClosingOrEnteringPip() {
- return (isAnimating() && hiddenRequested) || mWillCloseOrEnterPip;
- }
-
- /**
- * @return Whether we are allowed to show non-starting windows at the moment. We disallow
- * showing windows during transitions in case we have windows that have wide-color-gamut
- * color mode set to avoid jank in the middle of the transition.
- */
- boolean canShowWindows() {
- return allDrawn && !(isReallyAnimating() && hasNonDefaultColorWindow());
- }
-
- /**
- * @return true if we have a window that has a non-default color mode set; false otherwise.
- */
- private boolean hasNonDefaultColorWindow() {
- return forAllWindows(ws -> ws.mAttrs.getColorMode() != COLOR_MODE_DEFAULT,
- true /* topToBottom */);
- }
-
- private void updateColorTransform() {
- if (mSurfaceControl != null && mLastAppSaturationInfo != null) {
- getPendingTransaction().setColorTransform(mSurfaceControl,
- mLastAppSaturationInfo.mMatrix, mLastAppSaturationInfo.mTranslation);
- mWmService.scheduleAnimationLocked();
- }
- }
-
- private static class AppSaturationInfo {
- float[] mMatrix = new float[9];
- float[] mTranslation = new float[3];
-
- void setSaturation(@Size(9) float[] matrix, @Size(3) float[] translation) {
- System.arraycopy(matrix, 0, mMatrix, 0, mMatrix.length);
- System.arraycopy(translation, 0, mTranslation, 0, mTranslation.length);
- }
- }
-}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 4c3611e..940e814 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -270,9 +270,9 @@
final AppTransitionController mAppTransitionController;
boolean mSkipAppTransitionAnimation = false;
- final ArraySet<AppWindowToken> mOpeningApps = new ArraySet<>();
- final ArraySet<AppWindowToken> mClosingApps = new ArraySet<>();
- final ArraySet<AppWindowToken> mChangingApps = new ArraySet<>();
+ final ArraySet<ActivityRecord> mOpeningApps = new ArraySet<>();
+ final ArraySet<ActivityRecord> mClosingApps = new ArraySet<>();
+ final ArraySet<ActivityRecord> mChangingApps = new ArraySet<>();
final UnknownAppVisibilityController mUnknownAppVisibilityController;
BoundsAnimationController mBoundsAnimationController;
@@ -438,7 +438,7 @@
/** A collection of windows that provide tap exclude regions inside of them. */
final ArraySet<WindowState> mTapExcludeProvidingWindows = new ArraySet<>();
- private final LinkedList<AppWindowToken> mTmpUpdateAllDrawn = new LinkedList();
+ private final LinkedList<ActivityRecord> mTmpUpdateAllDrawn = new LinkedList();
private final TaskForResizePointSearchResult mTmpTaskForResizePointSearchResult =
new TaskForResizePointSearchResult();
@@ -480,7 +480,7 @@
* the user taps on the area outside of the task of the focused app, we will notify AM about the
* new task the user wants to interact with.
*/
- AppWindowToken mFocusedApp = null;
+ ActivityRecord mFocusedApp = null;
/** Windows added since {@link #mCurrentFocus} was set to null. Used for ANR blaming. */
final ArrayList<WindowState> mWinAddedSinceNullFocus = new ArrayList<>();
@@ -563,9 +563,9 @@
private final Consumer<WindowState> mUpdateWindowsForAnimator = w -> {
WindowStateAnimator winAnimator = w.mWinAnimator;
- final AppWindowToken atoken = w.mAppToken;
+ final ActivityRecord activity = w.mActivityRecord;
if (winAnimator.mDrawState == READY_TO_SHOW) {
- if (atoken == null || atoken.canShowWindows()) {
+ if (activity == null || activity.canShowWindows()) {
if (w.performShowLocked()) {
pendingLayoutChanges |= FINISH_LAYOUT_REDO_ANIM;
if (DEBUG_LAYOUT_REPEATS) {
@@ -589,7 +589,7 @@
};
private final ToBooleanFunction<WindowState> mFindFocusedWindow = w -> {
- final AppWindowToken focusedApp = mFocusedApp;
+ final ActivityRecord focusedApp = mFocusedApp;
ProtoLog.v(WM_DEBUG_FOCUS, "Looking for focus: %s, flags=%d, canReceive=%b",
w, w.mAttrs.flags, w.canReceiveKeys());
@@ -597,12 +597,12 @@
return false;
}
- final AppWindowToken wtoken = w.mAppToken;
+ final ActivityRecord activity = w.mActivityRecord;
// If this window's application has been removed, just skip it.
- if (wtoken != null && (wtoken.removed || wtoken.sendingToBottom)) {
- ProtoLog.v(WM_DEBUG_FOCUS, "Skipping %s because %s", wtoken,
- (wtoken.removed ? "removed" : "sendingToBottom"));
+ if (activity!= null && (activity.removed || activity.sendingToBottom)) {
+ ProtoLog.v(WM_DEBUG_FOCUS, "Skipping %s because %s", activity,
+ (activity.removed ? "removed" : "sendingToBottom"));
return false;
}
@@ -622,9 +622,9 @@
}
// Descend through all of the app tokens and find the first that either matches
- // win.mAppToken (return win) or mFocusedApp (return null).
- if (wtoken != null && w.mAttrs.type != TYPE_APPLICATION_STARTING) {
- if (focusedApp.compareTo(wtoken) > 0) {
+ // win.mActivityRecord (return win) or mFocusedApp (return null).
+ if (activity != null && w.mAttrs.type != TYPE_APPLICATION_STARTING) {
+ if (focusedApp.compareTo(activity) > 0) {
// App stack below focused app stack. No focus for you!!!
ProtoLog.v(WM_DEBUG_FOCUS_LIGHT,
"findFocusedWindow: Reached focused app=%s", focusedApp);
@@ -648,14 +648,14 @@
Slog.v(TAG, "1ST PASS " + w + ": gone=" + gone + " mHaveFrame=" + w.mHaveFrame
+ " mLayoutAttached=" + w.mLayoutAttached
+ " config reported=" + w.isLastConfigReportedToClient());
- final AppWindowToken atoken = w.mAppToken;
+ final ActivityRecord activity = w.mActivityRecord;
if (gone) Slog.v(TAG, " GONE: mViewVisibility=" + w.mViewVisibility
+ " mRelayoutCalled=" + w.mRelayoutCalled + " hidden=" + w.mToken.isHidden()
- + " hiddenRequested=" + (atoken != null && atoken.hiddenRequested)
+ + " hiddenRequested=" + (activity != null && activity.hiddenRequested)
+ " parentHidden=" + w.isParentWindowHidden());
else Slog.v(TAG, " VIS: mViewVisibility=" + w.mViewVisibility
+ " mRelayoutCalled=" + w.mRelayoutCalled + " hidden=" + w.mToken.isHidden()
- + " hiddenRequested=" + (atoken != null && atoken.hiddenRequested)
+ + " hiddenRequested=" + (activity != null && activity.hiddenRequested)
+ " parentHidden=" + w.isParentWindowHidden());
}
@@ -683,8 +683,8 @@
w.updateLastInsetValues();
}
- if (w.mAppToken != null) {
- w.mAppToken.layoutLetterbox(w);
+ if (w.mActivityRecord != null) {
+ w.mActivityRecord.layoutLetterbox(w);
}
if (DEBUG_LAYOUT) Slog.v(TAG, " LAYOUT: mFrame=" + w.getFrameLw()
@@ -825,12 +825,12 @@
}
}
- final AppWindowToken atoken = w.mAppToken;
- if (atoken != null) {
- atoken.updateLetterboxSurface(w);
- final boolean updateAllDrawn = atoken.updateDrawnWindowStates(w);
- if (updateAllDrawn && !mTmpUpdateAllDrawn.contains(atoken)) {
- mTmpUpdateAllDrawn.add(atoken);
+ final ActivityRecord activity = w.mActivityRecord;
+ if (activity != null) {
+ activity.updateLetterboxSurface(w);
+ final boolean updateAllDrawn = activity.updateDrawnWindowStates(w);
+ if (updateAllDrawn && !mTmpUpdateAllDrawn.contains(activity)) {
+ mTmpUpdateAllDrawn.add(activity);
}
}
@@ -966,12 +966,12 @@
return mTokenMap.get(binder);
}
- AppWindowToken getAppWindowToken(IBinder binder) {
+ ActivityRecord getActivityRecord(IBinder binder) {
final WindowToken token = getWindowToken(binder);
if (token == null) {
return null;
}
- return token.asAppWindowToken();
+ return token.asActivityRecord();
}
private void addWindowToken(IBinder binder, WindowToken token) {
@@ -995,7 +995,7 @@
mTokenMap.put(binder, token);
- if (token.asAppWindowToken() == null) {
+ if (token.asActivityRecord() == null) {
// Add non-app token to container hierarchy on the display. App tokens are added through
// the parent container managing them (e.g. Tasks).
switch (token.windowType) {
@@ -1015,7 +1015,7 @@
WindowToken removeWindowToken(IBinder binder) {
final WindowToken token = mTokenMap.remove(binder);
- if (token != null && token.asAppWindowToken() == null) {
+ if (token != null && token.asActivityRecord() == null) {
token.setExiting();
}
return token;
@@ -1028,7 +1028,7 @@
return;
}
if (prevDc != null) {
- if (prevDc.mTokenMap.remove(token.token) != null && token.asAppWindowToken() == null) {
+ if (prevDc.mTokenMap.remove(token.token) != null && token.asActivityRecord() == null) {
// Removed the token from the map, but made sure it's not an app token before
// removing from parent.
token.getParent().removeChild(token);
@@ -1057,14 +1057,14 @@
return;
}
- final AppWindowToken appToken = token.asAppWindowToken();
+ final ActivityRecord activity = token.asActivityRecord();
- if (appToken == null) {
+ if (activity == null) {
Slog.w(TAG_WM, "Attempted to remove non-App token: " + binder + " token=" + token);
return;
}
- appToken.onRemovedFromDisplay();
+ activity.onRemovedFromDisplay();
}
@Override
@@ -1255,9 +1255,9 @@
// If we changed the orientation but mOrientationChangeComplete is already true,
// we used seamless rotation, and we don't need to freeze the screen.
if (freezeDisplayToken != null && !mWmService.mRoot.mOrientationChangeComplete) {
- final AppWindowToken atoken = getAppWindowToken(freezeDisplayToken);
- if (atoken != null) {
- atoken.startFreezingScreen();
+ final ActivityRecord activity = getActivityRecord(freezeDisplayToken);
+ if (activity != null) {
+ activity.startFreezingScreen();
}
}
config = new Configuration();
@@ -2979,10 +2979,10 @@
/**
* Set the new focused app to this display.
*
- * @param newFocus the new focused AppWindowToken.
+ * @param newFocus the new focused {@link ActivityRecord}.
* @return true if the focused app is changed.
*/
- boolean setFocusedApp(AppWindowToken newFocus) {
+ boolean setFocusedApp(ActivityRecord newFocus) {
if (newFocus != null) {
final DisplayContent appDisplay = newFocus.getDisplayContent();
if (appDisplay != this) {
@@ -3050,10 +3050,10 @@
wsa.destroySurface();
mWmService.mForceRemoves.add(w);
mTmpWindow = w;
- } else if (w.mAppToken != null && w.mAppToken.isClientHidden()) {
+ } else if (w.mActivityRecord != null && w.mActivityRecord.isClientHidden()) {
Slog.w(TAG_WM, "LEAKED SURFACE (app token hidden): "
+ w + " surface=" + wsa.mSurfaceController
- + " token=" + w.mAppToken);
+ + " token=" + w.mActivityRecord);
ProtoLog.i(WM_SHOW_TRANSACTIONS, "SURFACE LEAK DESTROY: %s", w);
wsa.destroySurface();
mTmpWindow = w;
@@ -3122,9 +3122,9 @@
// to be on top of it, but it is not -really- where input will go. So look down below
// for a real window to target...
if (target != null && target.mAttrs.type == TYPE_APPLICATION_STARTING) {
- final AppWindowToken token = target.mAppToken;
- if (token != null) {
- final WindowState betterTarget = token.getImeTargetBelowWindow(target);
+ final ActivityRecord activity = target.mActivityRecord;
+ if (activity != null) {
+ final WindowState betterTarget = activity.getImeTargetBelowWindow(target);
if (betterTarget != null) {
target = betterTarget;
}
@@ -3158,15 +3158,15 @@
}
if (updateImeTarget) {
- AppWindowToken token = curTarget == null ? null : curTarget.mAppToken;
- if (token != null) {
+ ActivityRecord activity = curTarget == null ? null : curTarget.mActivityRecord;
+ if (activity != null) {
// Now some fun for dealing with window animations that modify the Z order. We need
// to look at all windows below the current target that are in this app, finding the
// highest visible one in layering.
WindowState highestTarget = null;
- if (token.isSelfAnimating()) {
- highestTarget = token.getHighestAnimLayerWindow(curTarget);
+ if (activity.isSelfAnimating()) {
+ highestTarget = activity.getHighestAnimLayerWindow(curTarget);
}
if (highestTarget != null) {
@@ -3194,8 +3194,8 @@
* Calling {@link #computeImeTarget(boolean)} to update the input method target window in
* the candidate app window token if needed.
*/
- void computeImeTargetIfNeeded(AppWindowToken candidate) {
- if (mInputMethodTarget != null && mInputMethodTarget.mAppToken == candidate) {
+ void computeImeTargetIfNeeded(ActivityRecord candidate) {
+ if (mInputMethodTarget != null && mInputMethodTarget.mActivityRecord == candidate) {
computeImeTarget(true /* updateImeTarget */);
}
}
@@ -3233,12 +3233,12 @@
// Attach it to app if the target is part of an app and such app is covering the entire
// screen. If it's not covering the entire screen the IME might extend beyond the apps
// bounds.
- if (mInputMethodTarget != null && mInputMethodTarget.mAppToken != null
+ if (mInputMethodTarget != null && mInputMethodTarget.mActivityRecord != null
&& mInputMethodTarget.getWindowingMode() == WINDOWING_MODE_FULLSCREEN
// An activity with override bounds should be letterboxed inside its parent bounds,
// so it doesn't fill the screen.
- && mInputMethodTarget.mAppToken.matchParentBounds()) {
- return mInputMethodTarget.mAppToken.getSurfaceControl();
+ && mInputMethodTarget.mActivityRecord.matchParentBounds()) {
+ return mInputMethodTarget.mActivityRecord.getSurfaceControl();
}
// Otherwise, we just attach it to the display.
@@ -3341,7 +3341,7 @@
boolean subtle) {
final WindowManagerPolicy policy = mWmService.mPolicy;
forAllWindows(w -> {
- if (w.mAppToken == null && policy.canBeHiddenByKeyguardLw(w)
+ if (w.mActivityRecord == null && policy.canBeHiddenByKeyguardLw(w)
&& w.wouldBeVisibleIfPolicyIgnored() && !w.isVisible()) {
w.startAnimation(policy.createHiddenByKeyguardExit(
onWallpaper, goingToShade, subtle));
@@ -3601,10 +3601,10 @@
}
while (!mTmpUpdateAllDrawn.isEmpty()) {
- final AppWindowToken atoken = mTmpUpdateAllDrawn.removeLast();
+ final ActivityRecord activity = mTmpUpdateAllDrawn.removeLast();
// See if any windows have been drawn, so they (and others associated with them)
// can now be shown.
- atoken.updateAllDrawn();
+ activity.updateAllDrawn();
}
}
@@ -4175,15 +4175,15 @@
private boolean forAllExitingAppTokenWindows(ToBooleanFunction<WindowState> callback,
boolean traverseTopToBottom) {
- // For legacy reasons we process the TaskStack.mExitingAppTokens first here before the
+ // For legacy reasons we process the TaskStack.mExitingActivities first here before the
// app tokens.
// TODO: Investigate if we need to continue to do this or if we can just process them
// in-order.
if (traverseTopToBottom) {
for (int i = mChildren.size() - 1; i >= 0; --i) {
- final AppTokenList appTokens = mChildren.get(i).mExitingAppTokens;
- for (int j = appTokens.size() - 1; j >= 0; --j) {
- if (appTokens.get(j).forAllWindowsUnchecked(callback,
+ final List<ActivityRecord> activities = mChildren.get(i).mExitingActivities;
+ for (int j = activities.size() - 1; j >= 0; --j) {
+ if (activities.get(j).forAllWindowsUnchecked(callback,
traverseTopToBottom)) {
return true;
}
@@ -4192,10 +4192,10 @@
} else {
final int count = mChildren.size();
for (int i = 0; i < count; ++i) {
- final AppTokenList appTokens = mChildren.get(i).mExitingAppTokens;
- final int appTokensCount = appTokens.size();
+ final List<ActivityRecord> activities = mChildren.get(i).mExitingActivities;
+ final int appTokensCount = activities.size();
for (int j = 0; j < appTokensCount; j++) {
- if (appTokens.get(j).forAllWindowsUnchecked(callback,
+ if (activities.get(j).forAllWindowsUnchecked(callback,
traverseTopToBottom)) {
return true;
}
@@ -4207,27 +4207,27 @@
void setExitingTokensHasVisible(boolean hasVisible) {
for (int i = mChildren.size() - 1; i >= 0; --i) {
- final AppTokenList appTokens = mChildren.get(i).mExitingAppTokens;
- for (int j = appTokens.size() - 1; j >= 0; --j) {
- appTokens.get(j).hasVisible = hasVisible;
+ final ArrayList<ActivityRecord> activities = mChildren.get(i).mExitingActivities;
+ for (int j = activities.size() - 1; j >= 0; --j) {
+ activities.get(j).hasVisible = hasVisible;
}
}
}
void removeExistingAppTokensIfPossible() {
for (int i = mChildren.size() - 1; i >= 0; --i) {
- final AppTokenList appTokens = mChildren.get(i).mExitingAppTokens;
- for (int j = appTokens.size() - 1; j >= 0; --j) {
- final AppWindowToken token = appTokens.get(j);
- if (!token.hasVisible && !mClosingApps.contains(token)
- && (!token.mIsExiting || token.isEmpty())) {
- // Make sure there is no animation running on this token, so any windows
+ final ArrayList<ActivityRecord> activities = mChildren.get(i).mExitingActivities;
+ for (int j = activities.size() - 1; j >= 0; --j) {
+ final ActivityRecord activity = activities.get(j);
+ if (!activity.hasVisible && !mClosingApps.contains(activity)
+ && (!activity.mIsExiting || activity.isEmpty())) {
+ // Make sure there is no animation running on this activity, so any windows
// associated with it will be removed as soon as their animations are
// complete.
cancelAnimation();
ProtoLog.v(WM_DEBUG_ADD_REMOVE,
- "performLayout: App token exiting now removed %s", token);
- token.removeIfPossible();
+ "performLayout: Activity exiting now removed %s", activity);
+ activity.removeIfPossible();
}
}
}
@@ -4642,7 +4642,7 @@
// Keep IME window in mAboveAppWindowsContainers as long as app's starting window exists
// so it get's layered above the starting window.
if (imeTarget != null
- && !(imeTarget.mAppToken != null && imeTarget.mAppToken.hasStartingWindow())
+ && !(imeTarget.mActivityRecord != null && imeTarget.mActivityRecord.hasStartingWindow())
&& (!(imeTarget.inSplitScreenWindowingMode() || imeTarget.mToken.isAppAnimating())
&& (imeTarget.getSurfaceControl() != null))) {
mImeWindowsContainers.assignRelativeLayer(t, imeTarget.getSurfaceControl(),
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 60e9819..150e26e 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -3707,7 +3707,7 @@
@VisibleForTesting
static boolean isOverlappingWithNavBar(WindowState targetWindow, WindowState navBarWindow) {
if (navBarWindow == null || !navBarWindow.isVisibleLw()
- || targetWindow.mAppToken == null || !targetWindow.isVisibleLw()) {
+ || targetWindow.mActivityRecord == null || !targetWindow.isVisibleLw()) {
return false;
}
diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java
index 414e496..67f1d1b 100644
--- a/services/core/java/com/android/server/wm/DisplayRotation.java
+++ b/services/core/java/com/android/server/wm/DisplayRotation.java
@@ -520,7 +520,7 @@
// If the bounds of activity window is different from its parent, then reject to be seamless
// because the window position may change after rotation that will look like a sudden jump.
- if (w.mAppToken != null && !w.mAppToken.matchParentBounds()) {
+ if (w.mActivityRecord != null && !w.mActivityRecord.matchParentBounds()) {
return false;
}
diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index d3e42901..b454922 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -660,7 +660,7 @@
checkMinimizeChanged(false /* animate */);
}
- void notifyAppTransitionStarting(ArraySet<AppWindowToken> openingApps, int appTransition) {
+ void notifyAppTransitionStarting(ArraySet<ActivityRecord> openingApps, int appTransition) {
final boolean wasMinimized = mMinimizedDock;
checkMinimizeChanged(true /* animate */);
@@ -685,10 +685,10 @@
/**
* @return true if {@param apps} contains an activity in the docked stack, false otherwise.
*/
- private boolean containsAppInDockedStack(ArraySet<AppWindowToken> apps) {
+ private boolean containsAppInDockedStack(ArraySet<ActivityRecord> apps) {
for (int i = apps.size() - 1; i >= 0; i--) {
- final AppWindowToken token = apps.valueAt(i);
- if (token.getTask() != null && token.inSplitScreenPrimaryWindowingMode()) {
+ final ActivityRecord activity = apps.valueAt(i);
+ if (activity.getTask() != null && activity.inSplitScreenPrimaryWindowingMode()) {
return true;
}
}
@@ -722,7 +722,7 @@
final RecentsAnimationController recentsAnim = mService.getRecentsAnimationController();
final boolean minimizedForRecentsAnimation = recentsAnim != null &&
recentsAnim.isSplitScreenMinimized();
- boolean homeVisible = homeTask.getTopVisibleAppToken() != null;
+ boolean homeVisible = homeTask.getTopVisibleActivity() != null;
if (homeVisible && topSecondaryStack != null) {
// Home should only be considered visible if it is greater or equal to the top secondary
// stack in terms of z-order.
diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java
index abd7222..255ef6e 100644
--- a/services/core/java/com/android/server/wm/DragState.java
+++ b/services/core/java/com/android/server/wm/DragState.java
@@ -427,8 +427,8 @@
private boolean targetWindowSupportsGlobalDrag(WindowState targetWin) {
// Global drags are limited to system windows, and windows for apps that are targeting N and
// above.
- return targetWin.mAppToken == null
- || targetWin.mAppToken.mTargetSdk >= Build.VERSION_CODES.N;
+ return targetWin.mActivityRecord == null
+ || targetWin.mActivityRecord.mTargetSdk >= Build.VERSION_CODES.N;
}
/* helper - send a ACTION_DRAG_STARTED event only if the window has not
diff --git a/services/core/java/com/android/server/wm/InputManagerCallback.java b/services/core/java/com/android/server/wm/InputManagerCallback.java
index 9973e11..7f9e76b 100644
--- a/services/core/java/com/android/server/wm/InputManagerCallback.java
+++ b/services/core/java/com/android/server/wm/InputManagerCallback.java
@@ -81,7 +81,7 @@
*/
@Override
public long notifyANR(IBinder token, String reason) {
- AppWindowToken appWindowToken = null;
+ ActivityRecord activity = null;
WindowState windowState = null;
boolean aboveSystem = false;
//TODO(b/141764879) Limit scope of wm lock when input calls notifyANR
@@ -89,7 +89,7 @@
if (token != null) {
windowState = mService.mInputToWindowMap.get(token);
if (windowState != null) {
- appWindowToken = windowState.mAppToken;
+ activity = windowState.mActivityRecord;
}
}
@@ -103,30 +103,30 @@
int systemAlertLayer = mService.mPolicy.getWindowLayerFromTypeLw(
TYPE_APPLICATION_OVERLAY, windowState.mOwnerCanAddInternalSystemWindow);
aboveSystem = windowState.mBaseLayer > systemAlertLayer;
- } else if (appWindowToken != null) {
+ } else if (activity != null) {
Slog.i(TAG_WM, "Input event dispatching timed out "
- + "sending to application " + appWindowToken.stringName
+ + "sending to application " + activity.stringName
+ ". Reason: " + reason);
} else {
Slog.i(TAG_WM, "Input event dispatching timed out "
+ ". Reason: " + reason);
}
- mService.saveANRStateLocked(appWindowToken, windowState, reason);
+ mService.saveANRStateLocked(activity, windowState, reason);
}
// All the calls below need to happen without the WM lock held since they call into AM.
mService.mAtmInternal.saveANRState(reason);
- if (appWindowToken != null && appWindowToken.appToken != null) {
+ if (activity != null && activity.appToken != null) {
// Notify the activity manager about the timeout and let it decide whether
// to abort dispatching or keep waiting.
- final boolean abort = appWindowToken.keyDispatchingTimedOut(reason,
+ final boolean abort = activity.keyDispatchingTimedOut(reason,
windowState.mSession.mPid);
if (!abort) {
// The activity manager declined to abort dispatching.
// Wait a bit longer and timeout again later.
- return appWindowToken.mInputDispatchingTimeoutNanos;
+ return activity.mInputDispatchingTimeoutNanos;
}
} else if (windowState != null) {
// Notify the activity manager about the timeout and let it decide whether
diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 584c6e1..f9ff2e3 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -263,7 +263,7 @@
inputWindowHandle.canReceiveKeys = child.canReceiveKeys();
inputWindowHandle.hasFocus = hasFocus;
inputWindowHandle.hasWallpaper = hasWallpaper;
- inputWindowHandle.paused = child.mAppToken != null ? child.mAppToken.paused : false;
+ inputWindowHandle.paused = child.mActivityRecord != null ? child.mActivityRecord.paused : false;
inputWindowHandle.layer = child.mLayer;
inputWindowHandle.ownerPid = child.mSession.mPid;
inputWindowHandle.ownerUid = child.mSession.mUid;
@@ -353,7 +353,7 @@
}
}
- public void setFocusedAppLw(AppWindowToken newApp) {
+ public void setFocusedAppLw(ActivityRecord newApp) {
// Focused app has changed.
if (newApp == null) {
mService.mInputManager.setFocusedApplication(mDisplayId, null);
@@ -476,7 +476,7 @@
final RecentsAnimationController recentsAnimationController =
mService.getRecentsAnimationController();
if (recentsAnimationController != null
- && recentsAnimationController.shouldApplyInputConsumer(w.mAppToken)) {
+ && recentsAnimationController.shouldApplyInputConsumer(w.mActivityRecord)) {
if (recentsAnimationController.updateInputConsumerForApp(
recentsAnimationInputConsumer.mWindowHandle, hasFocus)) {
recentsAnimationInputConsumer.show(mInputTransaction, w);
diff --git a/services/core/java/com/android/server/wm/Letterbox.java b/services/core/java/com/android/server/wm/Letterbox.java
index c59a73b..6721ef8 100644
--- a/services/core/java/com/android/server/wm/Letterbox.java
+++ b/services/core/java/com/android/server/wm/Letterbox.java
@@ -174,7 +174,7 @@
InputInterceptor(String namePrefix, WindowState win) {
mWmService = win.mWmService;
- final String name = namePrefix + (win.mAppToken != null ? win.mAppToken : win);
+ final String name = namePrefix + (win.mActivityRecord != null ? win.mActivityRecord : win);
final InputChannel[] channels = InputChannel.openInputChannelPair(name);
mServerChannel = channels[0];
mClientChannel = channels[1];
diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java
index d606e5d..9a58a68 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimationController.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java
@@ -104,7 +104,7 @@
"failSafeRunnable");
// The recents component app token that is shown behind the visibile tasks
- private AppWindowToken mTargetAppToken;
+ private ActivityRecord mTargetActivityRecord;
private DisplayContent mDisplayContent;
private int mTargetActivityType;
private Rect mMinimizedHomeBounds = new Rect();
@@ -400,13 +400,13 @@
}
// Adjust the wallpaper visibility for the showing target activity
- final AppWindowToken recentsComponentAppToken =
- targetStack.getTopChild().getTopFullscreenAppToken();
- if (recentsComponentAppToken != null) {
+ final ActivityRecord recentsComponentActivity =
+ targetStack.getTopChild().getTopFullscreenActivity();
+ if (recentsComponentActivity != null) {
ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
- "setHomeApp(%s)", recentsComponentAppToken.getName());
- mTargetAppToken = recentsComponentAppToken;
- if (recentsComponentAppToken.windowsCanBeWallpaperTarget()) {
+ "setHomeApp(%s)", recentsComponentActivity.getName());
+ mTargetActivityRecord = recentsComponentActivity;
+ if (recentsComponentActivity.windowsCanBeWallpaperTarget()) {
mDisplayContent.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;
mDisplayContent.setLayoutNeeded();
}
@@ -480,13 +480,13 @@
// insets for the target app window after a rotation
mDisplayContent.performLayout(false /* initial */, false /* updateInputWindows */);
- final Rect minimizedHomeBounds = mTargetAppToken != null
- && mTargetAppToken.inSplitScreenSecondaryWindowingMode()
+ final Rect minimizedHomeBounds = mTargetActivityRecord != null
+ && mTargetActivityRecord.inSplitScreenSecondaryWindowingMode()
? mMinimizedHomeBounds
: null;
final Rect contentInsets;
- if (mTargetAppToken != null && mTargetAppToken.findMainWindow() != null) {
- contentInsets = mTargetAppToken.findMainWindow().getContentInsets();
+ if (mTargetActivityRecord != null && mTargetActivityRecord.findMainWindow() != null) {
+ contentInsets = mTargetActivityRecord.findMainWindow().getContentInsets();
} else {
// If the window for the activity had not yet been created, use the display insets.
mService.getStableInsets(mDisplayId, mTmpRect);
@@ -682,10 +682,10 @@
// We have deferred all notifications to the target app as a part of the recents animation,
// so if we are actually transitioning there, notify again here
- if (mTargetAppToken != null) {
+ if (mTargetActivityRecord != null) {
if (reorderMode == REORDER_MOVE_TO_TOP || reorderMode == REORDER_KEEP_IN_PLACE) {
mDisplayContent.mAppTransition.notifyAppTransitionFinishedLocked(
- mTargetAppToken.token);
+ mTargetActivityRecord.token);
}
}
@@ -740,25 +740,26 @@
}
boolean isWallpaperVisible(WindowState w) {
- return w != null && w.mAttrs.type == TYPE_BASE_APPLICATION && w.mAppToken != null
- && mTargetAppToken == w.mAppToken && isTargetOverWallpaper();
+ return w != null && w.mAttrs.type == TYPE_BASE_APPLICATION && w.mActivityRecord != null
+ && mTargetActivityRecord == w.mActivityRecord && isTargetOverWallpaper();
}
/**
* @return Whether to use the input consumer to override app input to route home/recents.
*/
- boolean shouldApplyInputConsumer(AppWindowToken appToken) {
+ boolean shouldApplyInputConsumer(ActivityRecord activity) {
// Only apply the input consumer if it is enabled, it is not the target (home/recents)
// being revealed with the transition, and we are actively animating the app as a part of
// the animation
- return mInputConsumerEnabled && mTargetAppToken != appToken && isAnimatingApp(appToken);
+ return mInputConsumerEnabled && mTargetActivityRecord != activity
+ && isAnimatingApp(activity);
}
boolean updateInputConsumerForApp(InputWindowHandle inputWindowHandle,
boolean hasFocus) {
// Update the input consumer touchable region to match the target app main window
- final WindowState targetAppMainWindow = mTargetAppToken != null
- ? mTargetAppToken.findMainWindow()
+ final WindowState targetAppMainWindow = mTargetActivityRecord != null
+ ? mTargetActivityRecord.findMainWindow()
: null;
if (targetAppMainWindow != null) {
targetAppMainWindow.getBounds(mTmpRect);
@@ -769,15 +770,15 @@
return false;
}
- boolean isTargetApp(AppWindowToken token) {
- return mTargetAppToken != null && token == mTargetAppToken;
+ boolean isTargetApp(ActivityRecord activity) {
+ return mTargetActivityRecord != null && activity == mTargetActivityRecord;
}
private boolean isTargetOverWallpaper() {
- if (mTargetAppToken == null) {
+ if (mTargetActivityRecord == null) {
return false;
}
- return mTargetAppToken.windowsCanBeWallpaperTarget();
+ return mTargetActivityRecord.windowsCanBeWallpaperTarget();
}
boolean isAnimatingTask(Task task) {
@@ -798,12 +799,12 @@
return false;
}
- private boolean isAnimatingApp(AppWindowToken appToken) {
+ private boolean isAnimatingApp(ActivityRecord activity) {
for (int i = mPendingAnimations.size() - 1; i >= 0; i--) {
final Task task = mPendingAnimations.get(i).mTask;
for (int j = task.getChildCount() - 1; j >= 0; j--) {
- final AppWindowToken app = task.getChildAt(j);
- if (app == appToken) {
+ final ActivityRecord app = task.getChildAt(j);
+ if (app == activity) {
return true;
}
}
@@ -813,7 +814,7 @@
boolean shouldIgnoreForAccessibility(WindowState windowState) {
final Task task = windowState.getTask();
- return task != null && isAnimatingTask(task) && !isTargetApp(windowState.mAppToken);
+ return task != null && isAnimatingTask(task) && !isTargetApp(windowState.mActivityRecord);
}
@VisibleForTesting
@@ -836,7 +837,7 @@
}
RemoteAnimationTarget createRemoteAnimationTarget() {
- final AppWindowToken topApp = mTask.getTopVisibleAppToken();
+ final ActivityRecord topApp = mTask.getTopVisibleActivity();
final WindowState mainWindow = topApp != null
? topApp.findMainWindow()
: null;
@@ -845,7 +846,7 @@
}
final Rect insets = new Rect();
mainWindow.getContentInsets(insets);
- InsetUtils.addInsets(insets, mainWindow.mAppToken.getLetterboxInsets());
+ InsetUtils.addInsets(insets, mainWindow.mActivityRecord.getLetterboxInsets());
final int mode = topApp.getActivityType() == mTargetActivityType
? MODE_OPENING
: MODE_CLOSING;
@@ -923,7 +924,7 @@
pw.print(innerPrefix); pw.println("mCanceled=" + mCanceled);
pw.print(innerPrefix); pw.println("mInputConsumerEnabled=" + mInputConsumerEnabled);
pw.print(innerPrefix); pw.println("mSplitScreenMinimized=" + mSplitScreenMinimized);
- pw.print(innerPrefix); pw.println("mTargetAppToken=" + mTargetAppToken);
+ pw.print(innerPrefix); pw.println("mTargetActivityRecord=" + mTargetActivityRecord);
pw.print(innerPrefix); pw.println("isTargetOverWallpaper=" + isTargetOverWallpaper());
pw.print(innerPrefix); pw.println("mRequestDeferCancelUntilNextTransition="
+ mRequestDeferCancelUntilNextTransition);
diff --git a/services/core/java/com/android/server/wm/RemoteAnimationController.java b/services/core/java/com/android/server/wm/RemoteAnimationController.java
index 2b2ae92..c23ffd9 100644
--- a/services/core/java/com/android/server/wm/RemoteAnimationController.java
+++ b/services/core/java/com/android/server/wm/RemoteAnimationController.java
@@ -76,20 +76,20 @@
}
/**
- * Creates an animation record for each individual {@link AppWindowToken}.
+ * Creates an animation record for each individual {@link ActivityRecord}.
*
- * @param appWindowToken The app to animate.
+ * @param activity The app to animate.
* @param position The position app bounds, in screen coordinates.
* @param stackBounds The stack bounds of the app relative to position.
* @param startBounds The stack bounds before the transition, in screen coordinates
* @return The record representing animation(s) to run on the app.
*/
- RemoteAnimationRecord createRemoteAnimationRecord(AppWindowToken appWindowToken,
- Point position, Rect stackBounds, Rect startBounds) {
+ RemoteAnimationRecord createRemoteAnimationRecord(ActivityRecord activity, Point position,
+ Rect stackBounds, Rect startBounds) {
ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "createAnimationAdapter(): token=%s",
- appWindowToken);
+ activity);
final RemoteAnimationRecord adapters =
- new RemoteAnimationRecord(appWindowToken, position, stackBounds, startBounds);
+ new RemoteAnimationRecord(activity, position, stackBounds, startBounds);
mPendingAnimations.add(adapters);
return adapters;
}
@@ -169,11 +169,11 @@
final RemoteAnimationRecord wrappers = mPendingAnimations.get(i);
final RemoteAnimationTarget target = wrappers.createRemoteAnimationTarget();
if (target != null) {
- ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "\tAdd token=%s", wrappers.mAppWindowToken);
+ ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "\tAdd token=%s", wrappers.mActivityRecord);
targets.add(target);
} else {
ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "\tRemove token=%s",
- wrappers.mAppWindowToken);
+ wrappers.mActivityRecord);
// We can't really start an animation but we still need to make sure to finish the
// pending animation that was started by SurfaceAnimator
@@ -228,7 +228,7 @@
.onAnimationFinished(adapters.mThumbnailAdapter);
}
mPendingAnimations.remove(i);
- ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "\tapp=%s", adapters.mAppWindowToken);
+ ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "\tapp=%s", adapters.mActivityRecord);
}
for (int i = mPendingWallpaperAnimations.size() - 1; i >= 0; i--) {
@@ -345,12 +345,12 @@
RemoteAnimationAdapterWrapper mAdapter;
RemoteAnimationAdapterWrapper mThumbnailAdapter = null;
RemoteAnimationTarget mTarget;
- final AppWindowToken mAppWindowToken;
+ final ActivityRecord mActivityRecord;
final Rect mStartBounds;
- RemoteAnimationRecord(AppWindowToken appWindowToken, Point endPos, Rect endBounds,
+ RemoteAnimationRecord(ActivityRecord activityRecord, Point endPos, Rect endBounds,
Rect startBounds) {
- mAppWindowToken = appWindowToken;
+ mActivityRecord = activityRecord;
mAdapter = new RemoteAnimationAdapterWrapper(this, endPos, endBounds);
if (startBounds != null) {
mStartBounds = new Rect(startBounds);
@@ -366,8 +366,8 @@
}
RemoteAnimationTarget createRemoteAnimationTarget() {
- final Task task = mAppWindowToken.getTask();
- final WindowState mainWindow = mAppWindowToken.findMainWindow();
+ final Task task = mActivityRecord.getTask();
+ final WindowState mainWindow = mActivityRecord.findMainWindow();
if (task == null || mainWindow == null || mAdapter == null
|| mAdapter.mCapturedFinishCallback == null
|| mAdapter.mCapturedLeash == null) {
@@ -375,11 +375,11 @@
}
final Rect insets = new Rect();
mainWindow.getContentInsets(insets);
- InsetUtils.addInsets(insets, mAppWindowToken.getLetterboxInsets());
+ InsetUtils.addInsets(insets, mActivityRecord.getLetterboxInsets());
mTarget = new RemoteAnimationTarget(task.mTaskId, getMode(),
- mAdapter.mCapturedLeash, !mAppWindowToken.fillsParent(),
+ mAdapter.mCapturedLeash, !mActivityRecord.fillsParent(),
mainWindow.mWinAnimator.mLastClipRect, insets,
- mAppWindowToken.getPrefixOrderIndex(), mAdapter.mPosition,
+ mActivityRecord.getPrefixOrderIndex(), mAdapter.mPosition,
mAdapter.mStackBounds, task.getWindowConfiguration(), false /*isNotInRecents*/,
mThumbnailAdapter != null ? mThumbnailAdapter.mCapturedLeash : null,
mStartBounds);
@@ -387,10 +387,10 @@
}
private int getMode() {
- final DisplayContent dc = mAppWindowToken.getDisplayContent();
- if (dc.mOpeningApps.contains(mAppWindowToken)) {
+ final DisplayContent dc = mActivityRecord.getDisplayContent();
+ if (dc.mOpeningApps.contains(mActivityRecord)) {
return RemoteAnimationTarget.MODE_OPENING;
- } else if (dc.mChangingApps.contains(mAppWindowToken)) {
+ } else if (dc.mChangingApps.contains(mActivityRecord)) {
return RemoteAnimationTarget.MODE_CHANGING;
} else {
return RemoteAnimationTarget.MODE_CLOSING;
@@ -423,7 +423,7 @@
ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "startAnimation");
// Restore z-layering, position and stack crop until client has a chance to modify it.
- t.setLayer(animationLeash, mRecord.mAppWindowToken.getPrefixOrderIndex());
+ t.setLayer(animationLeash, mRecord.mActivityRecord.getPrefixOrderIndex());
if (mRecord.mStartBounds != null) {
t.setPosition(animationLeash, mRecord.mStartBounds.left, mRecord.mStartBounds.top);
t.setWindowCrop(animationLeash, mRecord.mStartBounds.width(),
@@ -464,7 +464,7 @@
@Override
public void dump(PrintWriter pw, String prefix) {
- pw.print(prefix); pw.print("token="); pw.println(mRecord.mAppWindowToken);
+ pw.print(prefix); pw.print("token="); pw.println(mRecord.mActivityRecord);
if (mRecord.mTarget != null) {
pw.print(prefix); pw.println("Target:");
mRecord.mTarget.dump(pw, prefix + " ");
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index b6a05d1..17f5abd 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -129,7 +129,7 @@
private int mTopFocusedDisplayId = INVALID_DISPLAY;
// Map from the PID to the top most app which has a focused window of the process.
- final HashMap<Integer, AppWindowToken> mTopFocusedAppByProcess = new HashMap<>();
+ final HashMap<Integer, ActivityRecord> mTopFocusedAppByProcess = new HashMap<>();
// Only a separate transaction until we separate the apply surface changes
// transaction from the global transaction.
@@ -145,9 +145,9 @@
};
private static final Consumer<WindowState> sRemoveReplacedWindowsConsumer = w -> {
- final AppWindowToken aToken = w.mAppToken;
- if (aToken != null) {
- aToken.removeReplacedWindowIfNeeded(w);
+ final ActivityRecord activity = w.mActivityRecord;
+ if (activity != null) {
+ activity.removeReplacedWindowIfNeeded(w);
}
};
@@ -175,7 +175,7 @@
if (newFocus != null) {
final int pidOfNewFocus = newFocus.mSession.mPid;
if (mTopFocusedAppByProcess.get(pidOfNewFocus) == null) {
- mTopFocusedAppByProcess.put(pidOfNewFocus, newFocus.mAppToken);
+ mTopFocusedAppByProcess.put(pidOfNewFocus, newFocus.mActivityRecord);
}
if (topFocusedDisplayId == INVALID_DISPLAY) {
topFocusedDisplayId = dc.getDisplayId();
@@ -330,12 +330,12 @@
* NOTE: Only one AppWindowToken is allowed to exist in the system for a binder token, since
* AppWindowToken represents an activity which can only exist on one display.
*/
- AppWindowToken getAppWindowToken(IBinder binder) {
+ ActivityRecord getActivityRecord(IBinder binder) {
for (int i = mChildren.size() - 1; i >= 0; --i) {
final DisplayContent dc = mChildren.get(i);
- final AppWindowToken atoken = dc.getAppWindowToken(binder);
- if (atoken != null) {
- return atoken;
+ final ActivityRecord activity = dc.getActivityRecord(binder);
+ if (activity != null) {
+ return activity;
}
}
return null;
@@ -541,8 +541,8 @@
ProtoLog.i(WM_SHOW_SURFACE_ALLOC,
"SURFACE RECOVER DESTROY: %s", winAnimator.mWin);
winAnimator.destroySurface();
- if (winAnimator.mWin.mAppToken != null) {
- winAnimator.mWin.mAppToken.removeStartingWindow();
+ if (winAnimator.mWin.mActivityRecord != null) {
+ winAnimator.mWin.mActivityRecord.removeStartingWindow();
}
}
diff --git a/services/core/java/com/android/server/wm/SnapshotStartingData.java b/services/core/java/com/android/server/wm/SnapshotStartingData.java
index c9e43c5..3764122 100644
--- a/services/core/java/com/android/server/wm/SnapshotStartingData.java
+++ b/services/core/java/com/android/server/wm/SnapshotStartingData.java
@@ -35,7 +35,7 @@
}
@Override
- StartingSurface createStartingSurface(AppWindowToken atoken) {
- return mService.mTaskSnapshotController.createStartingSurface(atoken, mSnapshot);
+ StartingSurface createStartingSurface(ActivityRecord activity) {
+ return mService.mTaskSnapshotController.createStartingSurface(activity, mSnapshot);
}
}
diff --git a/services/core/java/com/android/server/wm/SplashScreenStartingData.java b/services/core/java/com/android/server/wm/SplashScreenStartingData.java
index f52ce38..726b7da 100644
--- a/services/core/java/com/android/server/wm/SplashScreenStartingData.java
+++ b/services/core/java/com/android/server/wm/SplashScreenStartingData.java
@@ -52,9 +52,9 @@
}
@Override
- StartingSurface createStartingSurface(AppWindowToken atoken) {
- return mService.mPolicy.addSplashScreen(atoken.token, mPkg, mTheme, mCompatInfo,
+ StartingSurface createStartingSurface(ActivityRecord activity) {
+ return mService.mPolicy.addSplashScreen(activity.token, mPkg, mTheme, mCompatInfo,
mNonLocalizedLabel, mLabelRes, mIcon, mLogo, mWindowFlags,
- mMergedOverrideConfiguration, atoken.getDisplayContent().getDisplayId());
+ mMergedOverrideConfiguration, activity.getDisplayContent().getDisplayId());
}
}
diff --git a/services/core/java/com/android/server/wm/StartingData.java b/services/core/java/com/android/server/wm/StartingData.java
index eb5011f..2e6e777 100644
--- a/services/core/java/com/android/server/wm/StartingData.java
+++ b/services/core/java/com/android/server/wm/StartingData.java
@@ -33,9 +33,9 @@
* Creates the actual starting window surface. DO NOT HOLD THE WINDOW MANAGER LOCK WHEN CALLING
* THIS METHOD.
*
- * @param atoken the app to add the starting window to
+ * @param activity the app to add the starting window to
* @return a class implementing {@link StartingSurface} for easy removal with
* {@link StartingSurface#remove}
*/
- abstract StartingSurface createStartingSurface(AppWindowToken atoken);
-}
\ No newline at end of file
+ abstract StartingSurface createStartingSurface(ActivityRecord activity);
+}
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 2657826..1db3149f 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -291,7 +291,7 @@
super.removeChild(child);
if (mChildren.isEmpty()) {
- EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, "removeAppToken: last token");
+ EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, "removeActivity: last activity");
if (mDeferRemoval) {
removeIfPossible();
}
@@ -413,7 +413,7 @@
/**
* Prepares the task bounds to be frozen with the current size. See
- * {@link AppWindowToken#freezeBounds}.
+ * {@link ActivityRecord#freezeBounds}.
*/
void prepareFreezingBounds() {
mPreparedFrozenBounds.set(getBounds());
@@ -474,7 +474,7 @@
private boolean getMaxVisibleBounds(Rect out) {
boolean foundTop = false;
for (int i = mChildren.size() - 1; i >= 0; i--) {
- final AppWindowToken token = mChildren.get(i);
+ final ActivityRecord token = mChildren.get(i);
// skip hidden (or about to hide) apps
if (token.mIsExiting || token.isClientHidden() || token.hiddenRequested) {
continue;
@@ -651,24 +651,24 @@
}
WindowState getTopVisibleAppMainWindow() {
- final AppWindowToken token = getTopVisibleAppToken();
- return token != null ? token.findMainWindow() : null;
+ final ActivityRecord activity = getTopVisibleActivity();
+ return activity != null ? activity.findMainWindow() : null;
}
- AppWindowToken getTopFullscreenAppToken() {
+ ActivityRecord getTopFullscreenActivity() {
for (int i = mChildren.size() - 1; i >= 0; i--) {
- final AppWindowToken token = mChildren.get(i);
- final WindowState win = token.findMainWindow();
+ final ActivityRecord activity = mChildren.get(i);
+ final WindowState win = activity.findMainWindow();
if (win != null && win.mAttrs.isFullscreen()) {
- return token;
+ return activity;
}
}
return null;
}
- AppWindowToken getTopVisibleAppToken() {
+ ActivityRecord getTopVisibleActivity() {
for (int i = mChildren.size() - 1; i >= 0; i--) {
- final AppWindowToken token = mChildren.get(i);
+ final ActivityRecord token = mChildren.get(i);
// skip hidden (or about to hide) apps
if (!token.mIsExiting && !token.isClientHidden() && !token.hiddenRequested) {
return token;
@@ -786,8 +786,8 @@
super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
proto.write(ID, mTaskId);
for (int i = mChildren.size() - 1; i >= 0; i--) {
- final AppWindowToken appWindowToken = mChildren.get(i);
- appWindowToken.writeToProto(proto, APP_WINDOW_TOKENS, logLevel);
+ final ActivityRecord activity = mChildren.get(i);
+ activity.writeToProto(proto, APP_WINDOW_TOKENS, logLevel);
}
proto.write(FILLS_PARENT, matchParentBounds());
getBounds().writeToProto(proto, BOUNDS);
@@ -813,9 +813,9 @@
final String quadruplePrefix = triplePrefix + " ";
for (int i = mChildren.size() - 1; i >= 0; i--) {
- final AppWindowToken wtoken = mChildren.get(i);
- pw.println(triplePrefix + "Activity #" + i + " " + wtoken);
- wtoken.dump(pw, quadruplePrefix, dumpAll);
+ final ActivityRecord activity = mChildren.get(i);
+ pw.println(triplePrefix + "Activity #" + i + " " + activity);
+ activity.dump(pw, quadruplePrefix, dumpAll);
}
}
diff --git a/services/core/java/com/android/server/wm/TaskPositioningController.java b/services/core/java/com/android/server/wm/TaskPositioningController.java
index 56b3bba..ed07f30 100644
--- a/services/core/java/com/android/server/wm/TaskPositioningController.java
+++ b/services/core/java/com/android/server/wm/TaskPositioningController.java
@@ -172,7 +172,7 @@
// on top (eg. a dialog window).
WindowState transferFocusFromWin = win;
if (displayContent.mCurrentFocus != null && displayContent.mCurrentFocus != win
- && displayContent.mCurrentFocus.mAppToken == win.mAppToken) {
+ && displayContent.mCurrentFocus.mActivityRecord == win.mActivityRecord) {
transferFocusFromWin = displayContent.mCurrentFocus;
}
if (!mInputManager.transferTouchFocus(
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotCache.java b/services/core/java/com/android/server/wm/TaskSnapshotCache.java
index 8175c4a..9e55113 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotCache.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotCache.java
@@ -34,7 +34,7 @@
private final WindowManagerService mService;
private final TaskSnapshotLoader mLoader;
- private final ArrayMap<AppWindowToken, Integer> mAppTaskMap = new ArrayMap<>();
+ private final ArrayMap<ActivityRecord, Integer> mAppTaskMap = new ArrayMap<>();
private final ArrayMap<Integer, CacheEntry> mRunningCache = new ArrayMap<>();
TaskSnapshotCache(WindowManagerService service, TaskSnapshotLoader loader) {
@@ -47,7 +47,7 @@
if (entry != null) {
mAppTaskMap.remove(entry.topApp);
}
- final AppWindowToken top = task.getTopChild();
+ final ActivityRecord top = task.getTopChild();
mAppTaskMap.put(top, task.mTaskId);
mRunningCache.put(task.mTaskId, new CacheEntry(snapshot, task.getTopChild()));
}
@@ -87,8 +87,8 @@
/**
* Called when an app token has been removed
*/
- void onAppRemoved(AppWindowToken wtoken) {
- final Integer taskId = mAppTaskMap.get(wtoken);
+ void onAppRemoved(ActivityRecord activity) {
+ final Integer taskId = mAppTaskMap.get(activity);
if (taskId != null) {
removeRunningEntry(taskId);
}
@@ -97,8 +97,8 @@
/**
* Callend when an app window token's process died.
*/
- void onAppDied(AppWindowToken wtoken) {
- final Integer taskId = mAppTaskMap.get(wtoken);
+ void onAppDied(ActivityRecord activity) {
+ final Integer taskId = mAppTaskMap.get(activity);
if (taskId != null) {
removeRunningEntry(taskId);
}
@@ -134,9 +134,9 @@
final TaskSnapshot snapshot;
/** The app token that was on top of the task when the snapshot was taken */
- final AppWindowToken topApp;
+ final ActivityRecord topApp;
- CacheEntry(TaskSnapshot snapshot, AppWindowToken topApp) {
+ CacheEntry(TaskSnapshot snapshot, ActivityRecord topApp) {
this.snapshot = snapshot;
this.topApp = topApp;
}
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java
index f9a6fe7..0d4ec65 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -140,13 +140,13 @@
/**
* Called when the visibility of an app changes outside of the regular app transition flow.
*/
- void notifyAppVisibilityChanged(AppWindowToken appWindowToken, boolean visible) {
+ void notifyAppVisibilityChanged(ActivityRecord appWindowToken, boolean visible) {
if (!visible) {
handleClosingApps(Sets.newArraySet(appWindowToken));
}
}
- private void handleClosingApps(ArraySet<AppWindowToken> closingApps) {
+ private void handleClosingApps(ArraySet<ActivityRecord> closingApps) {
if (shouldDisableSnapshots()) {
return;
}
@@ -215,9 +215,9 @@
* Creates a starting surface for {@param token} with {@param snapshot}. DO NOT HOLD THE WINDOW
* MANAGER LOCK WHEN CALLING THIS METHOD!
*/
- StartingSurface createStartingSurface(AppWindowToken token,
+ StartingSurface createStartingSurface(ActivityRecord activity,
TaskSnapshot snapshot) {
- return TaskSnapshotSurface.create(mService, token, snapshot);
+ return TaskSnapshotSurface.create(mService, activity, snapshot);
}
/**
@@ -225,21 +225,21 @@
* we're looking for, but during app transitions, trampoline activities can appear in the
* children, which should be ignored.
*/
- @Nullable private AppWindowToken findAppTokenForSnapshot(Task task) {
+ @Nullable private ActivityRecord findAppTokenForSnapshot(Task task) {
for (int i = task.getChildCount() - 1; i >= 0; --i) {
- final AppWindowToken appWindowToken = task.getChildAt(i);
- if (appWindowToken == null || !appWindowToken.isSurfaceShowing()
- || appWindowToken.findMainWindow() == null) {
+ final ActivityRecord activity = task.getChildAt(i);
+ if (activity == null || !activity.isSurfaceShowing()
+ || activity.findMainWindow() == null) {
continue;
}
- final boolean hasVisibleChild = appWindowToken.forAllWindows(
+ final boolean hasVisibleChild = activity.forAllWindows(
// Ensure at least one window for the top app is visible before attempting to
// take a screenshot. Visible here means that the WSA surface is shown and has
// an alpha greater than 0.
ws -> ws.mWinAnimator != null && ws.mWinAnimator.getShown()
&& ws.mWinAnimator.mLastAlpha > 0f, true /* traverseTopToBottom */);
if (hasVisibleChild) {
- return appWindowToken;
+ return activity;
}
}
return null;
@@ -275,16 +275,16 @@
return null;
}
- final AppWindowToken appWindowToken = findAppTokenForSnapshot(task);
- if (appWindowToken == null) {
+ final ActivityRecord activity = findAppTokenForSnapshot(task);
+ if (activity == null) {
if (DEBUG_SCREENSHOT) {
Slog.w(TAG_WM, "Failed to take screenshot. No visible windows for " + task);
}
return null;
}
- if (appWindowToken.hasCommittedReparentToAnimationLeash()) {
+ if (activity.hasCommittedReparentToAnimationLeash()) {
if (DEBUG_SCREENSHOT) {
- Slog.w(TAG_WM, "Failed to take screenshot. App is animating " + appWindowToken);
+ Slog.w(TAG_WM, "Failed to take screenshot. App is animating " + activity);
}
return null;
}
@@ -294,7 +294,7 @@
? mPersister.getReducedScale()
: mFullSnapshotScale;
- final WindowState mainWindow = appWindowToken.findMainWindow();
+ final WindowState mainWindow = activity.findMainWindow();
if (mainWindow == null) {
Slog.w(TAG_WM, "Failed to take screenshot. No main window for " + task);
return null;
@@ -311,12 +311,12 @@
final boolean isWindowTranslucent = mainWindow.getAttrs().format != PixelFormat.OPAQUE;
return new TaskSnapshot(
System.currentTimeMillis() /* id */,
- appWindowToken.mActivityComponent, screenshotBuffer.getGraphicBuffer(),
+ activity.mActivityComponent, screenshotBuffer.getGraphicBuffer(),
screenshotBuffer.getColorSpace(),
- appWindowToken.getTask().getConfiguration().orientation,
+ activity.getTask().getConfiguration().orientation,
getInsets(mainWindow), isLowRamDevice /* reduced */, scaleFraction /* scale */,
true /* isRealSnapshot */, task.getWindowingMode(), getSystemUiVisibility(task),
- !appWindowToken.fillsParent() || isWindowTranslucent);
+ !activity.fillsParent() || isWindowTranslucent);
}
private boolean shouldDisableSnapshots() {
@@ -327,7 +327,7 @@
// XXX(b/72757033): These are insets relative to the window frame, but we're really
// interested in the insets relative to the task bounds.
final Rect insets = minRect(state.getContentInsets(), state.getStableInsets());
- InsetUtils.addInsets(insets, state.mAppToken.getLetterboxInsets());
+ InsetUtils.addInsets(insets, state.mActivityRecord.getLetterboxInsets());
return insets;
}
@@ -342,11 +342,11 @@
* Retrieves all closing tasks based on the list of closing apps during an app transition.
*/
@VisibleForTesting
- void getClosingTasks(ArraySet<AppWindowToken> closingApps, ArraySet<Task> outClosingTasks) {
+ void getClosingTasks(ArraySet<ActivityRecord> closingApps, ArraySet<Task> outClosingTasks) {
outClosingTasks.clear();
for (int i = closingApps.size() - 1; i >= 0; i--) {
- final AppWindowToken atoken = closingApps.valueAt(i);
- final Task task = atoken.getTask();
+ final ActivityRecord activity = closingApps.valueAt(i);
+ final Task task = activity.getTask();
// If the task of the app is not visible anymore, it means no other app in that task
// is opening. Thus, the task is closing.
@@ -358,7 +358,7 @@
@VisibleForTesting
int getSnapshotMode(Task task) {
- final AppWindowToken topChild = task.getTopChild();
+ final ActivityRecord topChild = task.getTopChild();
if (!task.isActivityTypeStandardOrUndefined() && !task.isActivityTypeAssistant()) {
return SNAPSHOT_MODE_NONE;
} else if (topChild != null && topChild.shouldUseAppThemeSnapshot()) {
@@ -373,7 +373,7 @@
* as possible by using the theme's window background.
*/
private TaskSnapshot drawAppThemeSnapshot(Task task) {
- final AppWindowToken topChild = task.getTopChild();
+ final ActivityRecord topChild = task.getTopChild();
if (topChild == null) {
return null;
}
@@ -415,17 +415,17 @@
}
/**
- * Called when an {@link AppWindowToken} has been removed.
+ * Called when an {@link ActivityRecord} has been removed.
*/
- void onAppRemoved(AppWindowToken wtoken) {
- mCache.onAppRemoved(wtoken);
+ void onAppRemoved(ActivityRecord activity) {
+ mCache.onAppRemoved(activity);
}
/**
- * Called when the process of an {@link AppWindowToken} has died.
+ * Called when the process of an {@link ActivityRecord} has died.
*/
- void onAppDied(AppWindowToken wtoken) {
- mCache.onAppDied(wtoken);
+ void onAppDied(ActivityRecord activity) {
+ mCache.onAppDied(activity);
}
void notifyTaskRemovedFromRecents(int taskId, int userId) {
@@ -481,9 +481,9 @@
* {@param task}.
*/
private int getSystemUiVisibility(Task task) {
- final AppWindowToken topFullscreenToken = task.getTopFullscreenAppToken();
- final WindowState topFullscreenWindow = topFullscreenToken != null
- ? topFullscreenToken.getTopFullscreenWindow()
+ final ActivityRecord topFullscreenActivity = task.getTopFullscreenActivity();
+ final WindowState topFullscreenWindow = topFullscreenActivity != null
+ ? topFullscreenActivity.getTopFullscreenWindow()
: null;
if (topFullscreenWindow != null) {
return topFullscreenWindow.getSystemUiVisibility();
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
index 172ebce..b1e5c8f 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java
@@ -136,7 +136,7 @@
private final int mOrientationOnCreation;
private final SurfaceControl.Transaction mTransaction;
- static TaskSnapshotSurface create(WindowManagerService service, AppWindowToken token,
+ static TaskSnapshotSurface create(WindowManagerService service, ActivityRecord activity,
TaskSnapshot snapshot) {
final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
@@ -159,23 +159,24 @@
final int windowPrivateFlags;
final int currentOrientation;
synchronized (service.mGlobalLock) {
- final WindowState mainWindow = token.findMainWindow();
- final Task task = token.getTask();
+ final WindowState mainWindow = activity.findMainWindow();
+ final Task task = activity.getTask();
if (task == null) {
- Slog.w(TAG, "TaskSnapshotSurface.create: Failed to find task for token="
- + token);
+ Slog.w(TAG, "TaskSnapshotSurface.create: Failed to find task for activity="
+ + activity);
return null;
}
- final AppWindowToken topFullscreenToken = token.getTask().getTopFullscreenAppToken();
- if (topFullscreenToken == null) {
+ final ActivityRecord topFullscreenActivity =
+ activity.getTask().getTopFullscreenActivity();
+ if (topFullscreenActivity == null) {
Slog.w(TAG, "TaskSnapshotSurface.create: Failed to find top fullscreen for task="
+ task);
return null;
}
- final WindowState topFullscreenWindow = topFullscreenToken.getTopFullscreenWindow();
+ final WindowState topFullscreenWindow = topFullscreenActivity.getTopFullscreenWindow();
if (mainWindow == null || topFullscreenWindow == null) {
- Slog.w(TAG, "TaskSnapshotSurface.create: Failed to find main window for token="
- + token);
+ Slog.w(TAG, "TaskSnapshotSurface.create: Failed to find main window for activity="
+ + activity);
return null;
}
sysUiVis = topFullscreenWindow.getSystemUiVisibility();
@@ -191,7 +192,7 @@
| FLAG_NOT_FOCUSABLE
| FLAG_NOT_TOUCHABLE;
layoutParams.privateFlags = windowPrivateFlags & PRIVATE_FLAG_INHERITS;
- layoutParams.token = token.token;
+ layoutParams.token = activity.token;
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layoutParams.systemUiVisibility = sysUiVis;
@@ -207,7 +208,7 @@
}
try {
final int res = session.addToDisplay(window, window.mSeq, layoutParams,
- View.GONE, token.getDisplayContent().getDisplayId(), tmpFrame, tmpRect, tmpRect,
+ View.GONE, activity.getDisplayContent().getDisplayId(), tmpFrame, tmpRect, tmpRect,
tmpRect, tmpCutout, null, mTmpInsetsState);
if (res < 0) {
Slog.w(TAG, "Failed to add snapshot starting window res=" + res);
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 10d8328..fc9a110 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -78,6 +78,7 @@
import com.android.server.EventLogTags;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.List;
public class TaskStack extends WindowContainer<Task> implements
@@ -110,9 +111,9 @@
*/
private final Rect mFullyAdjustedImeBounds = new Rect();
- /** Application tokens that are exiting, but still on screen for animations. */
- final AppTokenList mExitingAppTokens = new AppTokenList();
- final AppTokenList mTmpAppTokens = new AppTokenList();
+ /** ActivityRecords that are exiting, but still on screen for animations. */
+ final ArrayList<ActivityRecord> mExitingActivities = new ArrayList<>();
+ final ArrayList<ActivityRecord> mTmpActivities = new ArrayList<>();
/** Detach this stack from its display when animation completes. */
// TODO: maybe tie this to WindowContainer#removeChild some how...
@@ -153,8 +154,8 @@
final Rect mTmpDimBoundsRect = new Rect();
private final Point mLastSurfaceSize = new Point();
- private final AnimatingAppWindowTokenRegistry mAnimatingAppWindowTokenRegistry =
- new AnimatingAppWindowTokenRegistry();
+ private final AnimatingActivityRegistry mAnimatingActivityRegistry =
+ new AnimatingActivityRegistry();
TaskStack(WindowManagerService service, int stackId, ActivityStack activityStack) {
super(service);
@@ -676,11 +677,11 @@
}
mDisplayContent.setLayoutNeeded();
}
- for (int appNdx = mExitingAppTokens.size() - 1; appNdx >= 0; --appNdx) {
- final AppWindowToken wtoken = mExitingAppTokens.get(appNdx);
- if (wtoken.getTask() == task) {
- wtoken.mIsExiting = false;
- mExitingAppTokens.remove(appNdx);
+ for (int appNdx = mExitingActivities.size() - 1; appNdx >= 0; --appNdx) {
+ final ActivityRecord activity = mExitingActivities.get(appNdx);
+ if (activity.getTask() == task) {
+ activity.mIsExiting = false;
+ mExitingActivities.remove(appNdx);
}
}
}
@@ -1327,18 +1328,18 @@
for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) {
mChildren.get(taskNdx).dump(pw, prefix + " ", dumpAll);
}
- if (!mExitingAppTokens.isEmpty()) {
+ if (!mExitingActivities.isEmpty()) {
pw.println();
pw.println(" Exiting application tokens:");
- for (int i = mExitingAppTokens.size() - 1; i >= 0; i--) {
- WindowToken token = mExitingAppTokens.get(i);
+ for (int i = mExitingActivities.size() - 1; i >= 0; i--) {
+ WindowToken token = mExitingActivities.get(i);
pw.print(" Exiting App #"); pw.print(i);
pw.print(' '); pw.print(token);
pw.println(':');
token.dump(pw, " ", dumpAll);
}
}
- mAnimatingAppWindowTokenRegistry.dump(pw, "AnimatingApps:", prefix);
+ mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix);
}
@Override
@@ -1435,8 +1436,8 @@
Rect contentRect, Rect postExclude) {
for (int i = mChildren.size() - 1; i >= 0; --i) {
final Task task = mChildren.get(i);
- AppWindowToken token = task.getTopVisibleAppToken();
- if (token == null || !token.hasContentToDisplay()) {
+ ActivityRecord topVisibleActivity = task.getTopVisibleActivity();
+ if (topVisibleActivity == null || !topVisibleActivity.hasContentToDisplay()) {
continue;
}
@@ -1747,7 +1748,7 @@
if (homeTask == null) {
return true;
}
- final AppWindowToken homeApp = homeTask.getTopVisibleAppToken();
+ final ActivityRecord homeApp = homeTask.getTopVisibleActivity();
if (!homeTask.isVisible() || homeApp == null) {
return true;
}
@@ -1862,7 +1863,7 @@
scheduleAnimation();
}
- AnimatingAppWindowTokenRegistry getAnimatingAppWindowTokenRegistry() {
- return mAnimatingAppWindowTokenRegistry;
+ AnimatingActivityRegistry getAnimatingActivityRegistry() {
+ return mAnimatingActivityRegistry;
}
}
diff --git a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java
index 01abcab..61e9e50 100644
--- a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java
+++ b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java
@@ -29,7 +29,7 @@
import java.io.PrintWriter;
/**
- * Manages the set of {@link AppWindowToken}s for which we don't know yet whether it's visible or
+ * Manages the set of {@link ActivityRecord}s for which we don't know yet whether it's visible or
* not. This happens when starting an activity while the lockscreen is showing. In that case, the
* keyguard flags an app might set influence it's visibility, so we wait until this is resolved to
* start the transition to avoid flickers.
@@ -56,7 +56,7 @@
// Set of apps for which we don't know yet whether it's visible or not, depending on what kind
// of lockscreen flags the app might set during its first relayout.
- private final ArrayMap<AppWindowToken, Integer> mUnknownApps = new ArrayMap<>();
+ private final ArrayMap<ActivityRecord, Integer> mUnknownApps = new ArrayMap<>();
private final WindowManagerService mService;
@@ -87,52 +87,52 @@
return builder.toString();
}
- void appRemovedOrHidden(@NonNull AppWindowToken appWindow) {
+ void appRemovedOrHidden(@NonNull ActivityRecord activity) {
if (DEBUG_UNKNOWN_APP_VISIBILITY) {
- Slog.d(TAG, "App removed or hidden appWindow=" + appWindow);
+ Slog.d(TAG, "App removed or hidden activity=" + activity);
}
- mUnknownApps.remove(appWindow);
+ mUnknownApps.remove(activity);
}
/**
- * Notifies that {@param appWindow} has been launched behind Keyguard, and we need to wait until
+ * Notifies that {@param activity} has been launched behind Keyguard, and we need to wait until
* it is resumed and relaid out to resolve the visibility.
*/
- void notifyLaunched(@NonNull AppWindowToken appWindow) {
+ void notifyLaunched(@NonNull ActivityRecord activity) {
if (DEBUG_UNKNOWN_APP_VISIBILITY) {
- Slog.d(TAG, "App launched appWindow=" + appWindow);
+ Slog.d(TAG, "App launched activity=" + activity);
}
- mUnknownApps.put(appWindow, UNKNOWN_STATE_WAITING_RESUME);
+ mUnknownApps.put(activity, UNKNOWN_STATE_WAITING_RESUME);
}
/**
- * Notifies that {@param appWindow} has finished resuming.
+ * Notifies that {@param activity} has finished resuming.
*/
- void notifyAppResumedFinished(@NonNull AppWindowToken appWindow) {
- if (mUnknownApps.containsKey(appWindow)
- && mUnknownApps.get(appWindow) == UNKNOWN_STATE_WAITING_RESUME) {
+ void notifyAppResumedFinished(@NonNull ActivityRecord activity) {
+ if (mUnknownApps.containsKey(activity)
+ && mUnknownApps.get(activity) == UNKNOWN_STATE_WAITING_RESUME) {
if (DEBUG_UNKNOWN_APP_VISIBILITY) {
- Slog.d(TAG, "App resume finished appWindow=" + appWindow);
+ Slog.d(TAG, "App resume finished activity=" + activity);
}
- mUnknownApps.put(appWindow, UNKNOWN_STATE_WAITING_RELAYOUT);
+ mUnknownApps.put(activity, UNKNOWN_STATE_WAITING_RELAYOUT);
}
}
/**
- * Notifies that {@param appWindow} has relaid out.
+ * Notifies that {@param activity} has relaid out.
*/
- void notifyRelayouted(@NonNull AppWindowToken appWindow) {
- if (!mUnknownApps.containsKey(appWindow)) {
+ void notifyRelayouted(@NonNull ActivityRecord activity) {
+ if (!mUnknownApps.containsKey(activity)) {
return;
}
if (DEBUG_UNKNOWN_APP_VISIBILITY) {
- Slog.d(TAG, "App relayouted appWindow=" + appWindow);
+ Slog.d(TAG, "App relayouted appWindow=" + activity);
}
- int state = mUnknownApps.get(appWindow);
+ int state = mUnknownApps.get(activity);
if (state == UNKNOWN_STATE_WAITING_RELAYOUT) {
- mUnknownApps.put(appWindow, UNKNOWN_STATE_WAITING_VISIBILITY_UPDATE);
+ mUnknownApps.put(activity, UNKNOWN_STATE_WAITING_VISIBILITY_UPDATE);
mService.notifyKeyguardFlagsChanged(this::notifyVisibilitiesUpdated,
- appWindow.getDisplayContent().getDisplayId());
+ activity.getDisplayContent().getDisplayId());
}
}
diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java
index e7b09db..1e13aef 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -118,7 +118,7 @@
}
mFindResults.resetTopWallpaper = true;
- if (w.mAppToken != null && w.mAppToken.isHidden() && !w.mAppToken.isSelfAnimating()) {
+ if (w.mActivityRecord != null && w.mActivityRecord.isHidden() && !w.mActivityRecord.isSelfAnimating()) {
// If this window's app token is hidden and not animating, it is of no interest to us.
if (DEBUG_WALLPAPER) Slog.v(TAG, "Skipping hidden and not animating token: " + w);
@@ -135,10 +135,10 @@
mFindResults.setUseTopWallpaperAsTarget(true);
}
- final boolean keyguardGoingAwayWithWallpaper = (w.mAppToken != null
- && w.mAppToken.isSelfAnimating()
- && AppTransition.isKeyguardGoingAwayTransit(w.mAppToken.getTransit())
- && (w.mAppToken.getTransitFlags()
+ final boolean keyguardGoingAwayWithWallpaper = (w.mActivityRecord != null
+ && w.mActivityRecord.isSelfAnimating()
+ && AppTransition.isKeyguardGoingAwayTransit(w.mActivityRecord.getTransit())
+ && (w.mActivityRecord.getTransitFlags()
& TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0);
boolean needsShowWhenLockedWallpaper = false;
@@ -148,7 +148,7 @@
// The lowest show when locked window decides whether we need to put the wallpaper
// behind.
needsShowWhenLockedWallpaper = !isFullscreen(w.mAttrs)
- || (w.mAppToken != null && !w.mAppToken.fillsParent());
+ || (w.mActivityRecord != null && !w.mActivityRecord.fillsParent());
}
if (keyguardGoingAwayWithWallpaper || needsShowWhenLockedWallpaper) {
@@ -159,8 +159,8 @@
final RecentsAnimationController recentsAnimationController =
mService.getRecentsAnimationController();
- final boolean animationWallpaper = w.mAppToken != null && w.mAppToken.getAnimation() != null
- && w.mAppToken.getAnimation().getShowWallpaper();
+ final boolean animationWallpaper = w.mActivityRecord != null && w.mActivityRecord.getAnimation() != null
+ && w.mActivityRecord.getAnimation().getShowWallpaper();
final boolean hasWallpaper = (w.mAttrs.flags & FLAG_SHOW_WALLPAPER) != 0
|| animationWallpaper;
final boolean isRecentsTransitionTarget = (recentsAnimationController != null
@@ -223,22 +223,22 @@
&& recentsAnimationController.isWallpaperVisible(wallpaperTarget);
if (DEBUG_WALLPAPER) Slog.v(TAG, "Wallpaper vis: target " + wallpaperTarget + ", obscured="
+ (wallpaperTarget != null ? Boolean.toString(wallpaperTarget.mObscured) : "??")
- + " animating=" + ((wallpaperTarget != null && wallpaperTarget.mAppToken != null)
- ? wallpaperTarget.mAppToken.isSelfAnimating() : null)
+ + " animating=" + ((wallpaperTarget != null && wallpaperTarget.mActivityRecord != null)
+ ? wallpaperTarget.mActivityRecord.isSelfAnimating() : null)
+ " prev=" + mPrevWallpaperTarget
+ " recentsAnimationWallpaperVisible=" + isAnimatingWithRecentsComponent);
return (wallpaperTarget != null
&& (!wallpaperTarget.mObscured
|| isAnimatingWithRecentsComponent
- || (wallpaperTarget.mAppToken != null
- && wallpaperTarget.mAppToken.isSelfAnimating())))
+ || (wallpaperTarget.mActivityRecord != null
+ && wallpaperTarget.mActivityRecord.isSelfAnimating())))
|| mPrevWallpaperTarget != null;
}
boolean isWallpaperTargetAnimating() {
return mWallpaperTarget != null && mWallpaperTarget.isAnimating()
- && (mWallpaperTarget.mAppToken == null
- || !mWallpaperTarget.mAppToken.isWaitingForTransitionStart());
+ && (mWallpaperTarget.mActivityRecord == null
+ || !mWallpaperTarget.mActivityRecord.isWaitingForTransitionStart());
}
void updateWallpaperVisibility() {
@@ -527,10 +527,10 @@
return;
}
- final boolean newTargetHidden = wallpaperTarget.mAppToken != null
- && wallpaperTarget.mAppToken.hiddenRequested;
- final boolean oldTargetHidden = prevWallpaperTarget.mAppToken != null
- && prevWallpaperTarget.mAppToken.hiddenRequested;
+ final boolean newTargetHidden = wallpaperTarget.mActivityRecord != null
+ && wallpaperTarget.mActivityRecord.hiddenRequested;
+ final boolean oldTargetHidden = prevWallpaperTarget.mActivityRecord != null
+ && prevWallpaperTarget.mActivityRecord.hiddenRequested;
if (DEBUG_WALLPAPER_LIGHT) Slog.v(TAG, "Animating wallpapers:" + " old: "
+ prevWallpaperTarget + " hidden=" + oldTargetHidden + " new: " + wallpaperTarget
@@ -544,9 +544,9 @@
// is not. If they're both hidden, still use the new target.
mWallpaperTarget = prevWallpaperTarget;
} else if (newTargetHidden == oldTargetHidden
- && !mDisplayContent.mOpeningApps.contains(wallpaperTarget.mAppToken)
- && (mDisplayContent.mOpeningApps.contains(prevWallpaperTarget.mAppToken)
- || mDisplayContent.mClosingApps.contains(prevWallpaperTarget.mAppToken))) {
+ && !mDisplayContent.mOpeningApps.contains(wallpaperTarget.mActivityRecord)
+ && (mDisplayContent.mOpeningApps.contains(prevWallpaperTarget.mActivityRecord)
+ || mDisplayContent.mClosingApps.contains(prevWallpaperTarget.mActivityRecord))) {
// If they're both hidden (or both not hidden), prefer the one that's currently in
// opening or closing app list, this allows transition selection logic to better
// determine the wallpaper status of opening/closing apps.
@@ -661,23 +661,23 @@
* Adjusts the wallpaper windows if the input display has a pending wallpaper layout or one of
* the opening apps should be a wallpaper target.
*/
- void adjustWallpaperWindowsForAppTransitionIfNeeded(ArraySet<AppWindowToken> openingApps,
- ArraySet<AppWindowToken> changingApps) {
+ void adjustWallpaperWindowsForAppTransitionIfNeeded(ArraySet<ActivityRecord> openingApps,
+ ArraySet<ActivityRecord> changingApps) {
boolean adjust = false;
if ((mDisplayContent.pendingLayoutChanges & FINISH_LAYOUT_REDO_WALLPAPER) != 0) {
adjust = true;
} else {
for (int i = openingApps.size() - 1; i >= 0; --i) {
- final AppWindowToken token = openingApps.valueAt(i);
- if (token.windowsCanBeWallpaperTarget()) {
+ final ActivityRecord activity = openingApps.valueAt(i);
+ if (activity.windowsCanBeWallpaperTarget()) {
adjust = true;
break;
}
}
if (!adjust) {
for (int i = changingApps.size() - 1; i >= 0; --i) {
- final AppWindowToken token = changingApps.valueAt(i);
- if (token.windowsCanBeWallpaperTarget()) {
+ final ActivityRecord activity = changingApps.valueAt(i);
+ if (activity.windowsCanBeWallpaperTarget()) {
adjust = true;
break;
}
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index a4ab66a..037edf1 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -947,9 +947,9 @@
wrapper.release();
}
- void forAllAppWindows(Consumer<AppWindowToken> callback) {
+ void forAllActivities(Consumer<ActivityRecord> callback) {
for (int i = mChildren.size() - 1; i >= 0; --i) {
- mChildren.get(i).forAllAppWindows(callback);
+ mChildren.get(i).forAllActivities(callback);
}
}
@@ -1446,7 +1446,7 @@
final WindowManagerPolicy policy = mWmService.mPolicy;
forAllWindows(w -> {
final boolean keyguard = policy.isKeyguardHostWindow(w.mAttrs);
- if (w.isVisibleLw() && (w.mAppToken != null || keyguard)) {
+ if (w.isVisibleLw() && (w.mActivityRecord != null || keyguard)) {
w.mWinAnimator.mDrawState = DRAW_PENDING;
// Force add to mResizingWindows.
w.resetLastContentInsets();
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index c485280..2dd6d0a 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -531,7 +531,7 @@
* List of app window tokens that are waiting for replacing windows. If the
* replacement doesn't come in time the stale windows needs to be disposed of.
*/
- final ArrayList<AppWindowToken> mWindowReplacementTimeouts = new ArrayList<>();
+ final ArrayList<ActivityRecord> mWindowReplacementTimeouts = new ArrayList<>();
/**
* Windows that are being resized. Used so we can tell the client about
@@ -880,7 +880,7 @@
/** The display that the rotation animation is applying to. */
private int mFrozenDisplayId;
- /** Skip repeated AppWindowTokens initialization. Note that AppWindowsToken's version of this
+ /** Skip repeated ActivityRecords initialization. Note that AppWindowsToken's version of this
* is a long initialized to Long.MIN_VALUE so that it doesn't match this value on startup. */
int mTransactionSequence;
@@ -990,7 +990,7 @@
@Override
public void onAppTransitionFinishedLocked(IBinder token) {
mAtmInternal.notifyAppTransitionFinished();
- final AppWindowToken atoken = mRoot.getAppWindowToken(token);
+ final ActivityRecord atoken = mRoot.getActivityRecord(token);
if (atoken == null) {
return;
}
@@ -1368,7 +1368,7 @@
return WindowManagerGlobal.ADD_PERMISSION_DENIED;
}
- AppWindowToken atoken = null;
+ ActivityRecord activity = null;
final boolean hasParent = parentWindow != null;
// Use existing parent window token for child windows since they go in the same token
// as there parent window so we can apply the same policy on them.
@@ -1434,16 +1434,16 @@
session.mCanAddInternalSystemWindow, isRoundedCornerOverlay);
} else if (rootType >= FIRST_APPLICATION_WINDOW
&& rootType <= LAST_APPLICATION_WINDOW) {
- atoken = token.asAppWindowToken();
- if (atoken == null) {
+ activity = token.asActivityRecord();
+ if (activity == null) {
ProtoLog.w(WM_ERROR, "Attempted to add window with non-application token "
+ ".%s Aborting.", token);
return WindowManagerGlobal.ADD_NOT_APP_TOKEN;
- } else if (atoken.removed) {
+ } else if (activity.removed) {
ProtoLog.w(WM_ERROR, "Attempted to add window with exiting application token "
+ ".%s Aborting.", token);
return WindowManagerGlobal.ADD_APP_EXITING;
- } else if (type == TYPE_APPLICATION_STARTING && atoken.startingWindow != null) {
+ } else if (type == TYPE_APPLICATION_STARTING && activity.startingWindow != null) {
ProtoLog.w(WM_ERROR,
"Attempted to add starting window to token with already existing"
+ " starting window");
@@ -1495,8 +1495,8 @@
+ "%s. Aborting.", attrs.token);
return WindowManagerGlobal.ADD_BAD_APP_TOKEN;
}
- } else if (token.asAppWindowToken() != null) {
- ProtoLog.w(WM_ERROR, "Non-null appWindowToken for system window of rootType=%d",
+ } else if (token.asActivityRecord() != null) {
+ ProtoLog.w(WM_ERROR, "Non-null activity for system window of rootType=%d",
rootType);
// It is not valid to use an app token with other system types; we will
// instead make a new token for it (as if null had been passed in for the token).
@@ -1591,11 +1591,11 @@
final boolean hideSystemAlertWindows = !mHidingNonSystemOverlayWindows.isEmpty();
win.setForceHideNonSystemOverlayWindowIfNeeded(hideSystemAlertWindows);
- final AppWindowToken aToken = token.asAppWindowToken();
- if (type == TYPE_APPLICATION_STARTING && aToken != null) {
- aToken.startingWindow = win;
+ final ActivityRecord tokenActivity = token.asActivityRecord();
+ if (type == TYPE_APPLICATION_STARTING && tokenActivity != null) {
+ tokenActivity.startingWindow = win;
ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "addWindow: %s startingWindow=%s",
- aToken, win);
+ activity, win);
}
boolean imMayMove = true;
@@ -1636,12 +1636,12 @@
winAnimator.mEnterAnimationPending = true;
winAnimator.mEnteringAnimation = true;
// Check if we need to prepare a transition for replacing window first.
- if (atoken != null && atoken.isVisible()
- && !prepareWindowReplacementTransition(atoken)) {
+ if (activity != null && activity.isVisible()
+ && !prepareWindowReplacementTransition(activity)) {
// If not, check if need to set up a dummy transition during display freeze
// so that the unfreeze wait for the apps to draw. This might be needed if
// the app is relaunching.
- prepareNoneTransitionForRelaunching(atoken);
+ prepareNoneTransitionForRelaunching(activity);
}
final DisplayFrames displayFrames = displayContent.mDisplayFrames;
@@ -1651,10 +1651,10 @@
displayContent.calculateDisplayCutoutForRotation(displayInfo.rotation));
final Rect taskBounds;
final boolean floatingStack;
- if (atoken != null && atoken.getTask() != null) {
+ if (activity != null && activity.getTask() != null) {
taskBounds = mTmpRect;
- atoken.getTask().getBounds(mTmpRect);
- floatingStack = atoken.getTask().isFloating();
+ tokenActivity.getTask().getBounds(mTmpRect);
+ floatingStack = activity.getTask().isFloating();
} else {
taskBounds = null;
floatingStack = false;
@@ -1668,7 +1668,7 @@
if (mInTouchMode) {
res |= WindowManagerGlobal.ADD_FLAG_IN_TOUCH_MODE;
}
- if (win.mAppToken == null || !win.mAppToken.isClientHidden()) {
+ if (win.mActivityRecord == null || !win.mActivityRecord.isClientHidden()) {
res |= WindowManagerGlobal.ADD_FLAG_APP_VISIBLE;
}
@@ -1753,8 +1753,8 @@
WindowState attachedWindow) {
// Try using the target SDK of the root window
if (attachedWindow != null) {
- return attachedWindow.mAppToken != null
- && attachedWindow.mAppToken.mTargetSdk >= Build.VERSION_CODES.O;
+ return attachedWindow.mActivityRecord != null
+ && attachedWindow.mActivityRecord.mTargetSdk >= Build.VERSION_CODES.O;
} else {
// Otherwise, look at the package
try {
@@ -1778,9 +1778,9 @@
/**
* Returns true if we're done setting up any transitions.
*/
- private boolean prepareWindowReplacementTransition(AppWindowToken atoken) {
- atoken.clearAllDrawn();
- final WindowState replacedWindow = atoken.getReplacingWindow();
+ private boolean prepareWindowReplacementTransition(ActivityRecord activity) {
+ activity.clearAllDrawn();
+ final WindowState replacedWindow = activity.getReplacingWindow();
if (replacedWindow == null) {
// We expect to already receive a request to remove the old window. If it did not
// happen, let's just simply add a window.
@@ -1791,8 +1791,8 @@
Rect frame = replacedWindow.getVisibleFrameLw();
// We treat this as if this activity was opening, so we can trigger the app transition
// animation and piggy-back on existing transition animation infrastructure.
- final DisplayContent dc = atoken.getDisplayContent();
- dc.mOpeningApps.add(atoken);
+ final DisplayContent dc = activity.getDisplayContent();
+ dc.mOpeningApps.add(activity);
dc.prepareAppTransition(WindowManager.TRANSIT_ACTIVITY_RELAUNCH, ALWAYS_KEEP_CURRENT,
0 /* flags */, false /* forceOverride */);
dc.mAppTransition.overridePendingAppTransitionClipReveal(frame.left, frame.top,
@@ -1801,14 +1801,14 @@
return true;
}
- private void prepareNoneTransitionForRelaunching(AppWindowToken atoken) {
+ private void prepareNoneTransitionForRelaunching(ActivityRecord activity) {
// Set up a none-transition and add the app to opening apps, so that the display
// unfreeze wait for the apps to be drawn.
// Note that if the display unfroze already because app unfreeze timed out,
// we don't set up the transition anymore and just let it go.
- final DisplayContent dc = atoken.getDisplayContent();
- if (mDisplayFrozen && !dc.mOpeningApps.contains(atoken) && atoken.isRelaunching()) {
- dc.mOpeningApps.add(atoken);
+ final DisplayContent dc = activity.getDisplayContent();
+ if (mDisplayFrozen && !dc.mOpeningApps.contains(activity) && activity.isRelaunching()) {
+ dc.mOpeningApps.add(activity);
dc.prepareAppTransition(WindowManager.TRANSIT_NONE, !ALWAYS_KEEP_CURRENT, 0 /* flags */,
false /* forceOverride */);
dc.executeAppTransition();
@@ -1885,26 +1885,26 @@
}
final WindowToken token = win.mToken;
- final AppWindowToken atoken = win.mAppToken;
+ final ActivityRecord activity = win.mActivityRecord;
ProtoLog.v(WM_DEBUG_ADD_REMOVE, "Removing %s from %s", win, token);
// Window will already be removed from token before this post clean-up method is called.
if (token.isEmpty()) {
if (!token.mPersistOnEmpty) {
token.removeImmediately();
- } else if (atoken != null) {
- // TODO: Should this be moved into AppWindowToken.removeWindow? Might go away after
+ } else if (activity != null) {
+ // TODO: Should this be moved into ActivityRecord.removeWindow? Might go away after
// re-factor.
- atoken.firstWindowDrawn = false;
- atoken.clearAllDrawn();
- final TaskStack stack = atoken.getStack();
+ activity.firstWindowDrawn = false;
+ activity.clearAllDrawn();
+ final TaskStack stack = activity.getStack();
if (stack != null) {
- stack.mExitingAppTokens.remove(atoken);
+ stack.mExitingActivities.remove(activity);
}
}
}
- if (atoken != null) {
- atoken.postWindowRemoveStartingWindowCleanup(win);
+ if (activity != null) {
+ activity.postWindowRemoveStartingWindowCleanup(win);
}
if (win.mAttrs.type == TYPE_WALLPAPER) {
@@ -1917,8 +1917,8 @@
if (dc != null && !mWindowPlacerLocked.isInLayout()) {
dc.assignWindowLayers(true /* setLayoutNeeded */);
mWindowPlacerLocked.performSurfacePlacement();
- if (win.mAppToken != null) {
- win.mAppToken.updateReportedVisibilityLocked();
+ if (win.mActivityRecord != null) {
+ win.mActivityRecord.updateReportedVisibilityLocked();
}
}
@@ -2125,9 +2125,9 @@
| WindowManager.LayoutParams.SYSTEM_UI_VISIBILITY_CHANGED)) != 0) {
win.mLayoutNeeded = true;
}
- if (win.mAppToken != null && ((flagChanges & FLAG_SHOW_WHEN_LOCKED) != 0
+ if (win.mActivityRecord != null && ((flagChanges & FLAG_SHOW_WHEN_LOCKED) != 0
|| (flagChanges & FLAG_DISMISS_KEYGUARD) != 0)) {
- win.mAppToken.checkKeyguardFlagsChanged();
+ win.mActivityRecord.checkKeyguardFlagsChanged();
}
if (((attrChanges & LayoutParams.ACCESSIBILITY_TITLE_CHANGED) != 0)
&& (mAccessibilityController != null)) {
@@ -2196,8 +2196,8 @@
// We should only relayout if the view is visible, it is a starting window, or the
// associated appToken is not hidden.
final boolean shouldRelayout = viewVisibility == View.VISIBLE &&
- (win.mAppToken == null || win.mAttrs.type == TYPE_APPLICATION_STARTING
- || !win.mAppToken.isClientHidden());
+ (win.mActivityRecord == null || win.mAttrs.type == TYPE_APPLICATION_STARTING
+ || !win.mActivityRecord.isClientHidden());
// If we are not currently running the exit animation, we need to see about starting
// one.
@@ -2302,8 +2302,8 @@
WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
}
- if (win.mAppToken != null) {
- displayContent.mUnknownAppVisibilityController.notifyRelayouted(win.mAppToken);
+ if (win.mActivityRecord != null) {
+ displayContent.mUnknownAppVisibilityController.notifyRelayouted(win.mActivityRecord);
}
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: updateOrientation");
@@ -2315,8 +2315,8 @@
displayContent.mWallpaperController.updateWallpaperOffset(
win, displayInfo.logicalWidth, displayInfo.logicalHeight, false);
}
- if (win.mAppToken != null) {
- win.mAppToken.updateReportedVisibilityLocked();
+ if (win.mActivityRecord != null) {
+ win.mActivityRecord.updateReportedVisibilityLocked();
}
if (winAnimator.mReportSurfaceResized) {
winAnimator.mReportSurfaceResized = false;
@@ -2414,8 +2414,8 @@
if (displayContent.mInputMethodWindow == win) {
displayContent.setInputMethodWindowLocked(null);
}
- boolean stopped = win.mAppToken != null ? win.mAppToken.mAppStopped : true;
- // We set mDestroying=true so AppWindowToken#notifyAppStopped in-to destroy surfaces
+ boolean stopped = win.mActivityRecord != null ? win.mActivityRecord.mAppStopped : true;
+ // We set mDestroying=true so ActivityRecord#notifyAppStopped in-to destroy surfaces
// will later actually destroy the surface if we do not do so here. Normally we leave
// this to the exit animation.
win.mDestroying = true;
@@ -2700,7 +2700,7 @@
}
void setWindowOpaqueLocked(IBinder token, boolean isOpaque) {
- final AppWindowToken wtoken = mRoot.getAppWindowToken(token);
+ final ActivityRecord wtoken = mRoot.getActivityRecord(token);
if (wtoken != null) {
wtoken.setMainWindowOpaque(isOpaque);
}
@@ -4338,7 +4338,7 @@
// to make room for IME, but the window is not the focused window that's taking input.
// TODO (b/111080190): Consider the case of multiple IMEs on multi-display.
final DisplayContent topFocusedDisplay = mRoot.getTopFocusedDisplayContent();
- final AppWindowToken focusedApp = topFocusedDisplay.mFocusedApp;
+ final ActivityRecord focusedApp = topFocusedDisplay.mFocusedApp;
return (focusedApp != null && focusedApp.getTask() != null)
? focusedApp.getTask().mStack : null;
}
@@ -4823,8 +4823,8 @@
case WINDOW_REPLACEMENT_TIMEOUT: {
synchronized (mGlobalLock) {
for (int i = mWindowReplacementTimeouts.size() - 1; i >= 0; i--) {
- final AppWindowToken token = mWindowReplacementTimeouts.get(i);
- token.onWindowReplacementTimeout();
+ final ActivityRecord activity = mWindowReplacementTimeouts.get(i);
+ activity.onWindowReplacementTimeout();
}
mWindowReplacementTimeouts.clear();
}
@@ -5997,7 +5997,7 @@
mRoot.forAllWindows((w) -> {
if ((!visibleOnly || w.mWinAnimator.getShown())
- && (!appsOnly || w.mAppToken != null)) {
+ && (!appsOnly || w.mActivityRecord != null)) {
windows.add(w);
}
}, true /* traverseTopToBottom */);
@@ -6032,16 +6032,16 @@
* the time an ANR occurred before anything else in the system changes
* in response.
*
- * @param appWindowToken The application that ANR'd, may be null.
+ * @param activity The application that ANR'd, may be null.
* @param windowState The window that ANR'd, may be null.
* @param reason The reason for the ANR, may be null.
*/
- void saveANRStateLocked(AppWindowToken appWindowToken, WindowState windowState, String reason) {
+ void saveANRStateLocked(ActivityRecord activity, WindowState windowState, String reason) {
StringWriter sw = new StringWriter();
PrintWriter pw = new FastPrintWriter(sw, false, 1024);
pw.println(" ANR time: " + DateFormat.getDateTimeInstance().format(new Date()));
- if (appWindowToken != null) {
- pw.println(" Application at fault: " + appWindowToken.stringName);
+ if (activity != null) {
+ pw.println(" Application at fault: " + activity.stringName);
}
if (windowState != null) {
pw.println(" Window at fault: " + windowState.mAttrs.getTitle());
@@ -6287,19 +6287,19 @@
* @param token Application token for which the activity will be relaunched.
*/
void setWillReplaceWindow(IBinder token, boolean animate) {
- final AppWindowToken appWindowToken = mRoot.getAppWindowToken(token);
- if (appWindowToken == null) {
+ final ActivityRecord activity = mRoot.getActivityRecord(token);
+ if (activity == null) {
ProtoLog.w(WM_ERROR, "Attempted to set replacing window on non-existing app token %s",
token);
return;
}
- if (!appWindowToken.hasContentToDisplay()) {
+ if (!activity.hasContentToDisplay()) {
ProtoLog.w(WM_ERROR,
"Attempted to set replacing window on app token with no content %s",
token);
return;
}
- appWindowToken.setWillReplaceWindows(animate);
+ activity.setWillReplaceWindows(animate);
}
/**
@@ -6316,14 +6316,14 @@
// above. We should combine them or find better names.
void setWillReplaceWindows(IBinder token, boolean childrenOnly) {
synchronized (mGlobalLock) {
- final AppWindowToken appWindowToken = mRoot.getAppWindowToken(token);
- if (appWindowToken == null) {
+ final ActivityRecord activity = mRoot.getActivityRecord(token);
+ if (activity == null) {
ProtoLog.w(WM_ERROR,
"Attempted to set replacing window on non-existing app token %s",
token);
return;
}
- if (!appWindowToken.hasContentToDisplay()) {
+ if (!activity.hasContentToDisplay()) {
ProtoLog.w(WM_ERROR,
"Attempted to set replacing window on app token with no content %s",
token);
@@ -6331,9 +6331,9 @@
}
if (childrenOnly) {
- appWindowToken.setWillReplaceChildWindows();
+ activity.setWillReplaceChildWindows();
} else {
- appWindowToken.setWillReplaceWindows(false /* animate */);
+ activity.setWillReplaceWindows(false /* animate */);
}
scheduleClearWillReplaceWindows(token, true /* replacing */);
@@ -6350,22 +6350,22 @@
* @param replacing Whether the window is being replaced or not.
*/
void scheduleClearWillReplaceWindows(IBinder token, boolean replacing) {
- final AppWindowToken appWindowToken = mRoot.getAppWindowToken(token);
- if (appWindowToken == null) {
+ final ActivityRecord activity = mRoot.getActivityRecord(token);
+ if (activity == null) {
ProtoLog.w(WM_ERROR, "Attempted to reset replacing window on non-existing app token %s",
token);
return;
}
if (replacing) {
- scheduleWindowReplacementTimeouts(appWindowToken);
+ scheduleWindowReplacementTimeouts(activity);
} else {
- appWindowToken.clearWillReplaceWindows();
+ activity.clearWillReplaceWindows();
}
}
- void scheduleWindowReplacementTimeouts(AppWindowToken appWindowToken) {
- if (!mWindowReplacementTimeouts.contains(appWindowToken)) {
- mWindowReplacementTimeouts.add(appWindowToken);
+ void scheduleWindowReplacementTimeouts(ActivityRecord activity) {
+ if (!mWindowReplacementTimeouts.contains(activity)) {
+ mWindowReplacementTimeouts.add(activity);
}
mH.removeMessages(H.WINDOW_REPLACEMENT_TIMEOUT);
mH.sendEmptyMessageDelayed(
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 7ff9b70..c25a71d 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -249,7 +249,7 @@
final WindowId mWindowId;
WindowToken mToken;
// The same object as mToken if this is an app window and null for non-app windows.
- AppWindowToken mAppToken;
+ ActivityRecord mActivityRecord;
// mAttrs.flags is tested in animation without being locked. If the bits tested are ever
// modified they will need to be locked.
@@ -691,7 +691,7 @@
final boolean immersiveSticky =
(mSystemUiVisibility & immersiveStickyFlags) == immersiveStickyFlags;
return immersiveSticky && mWmService.mSystemGestureExcludedByPreQStickyImmersive
- && mAppToken != null && mAppToken.mTargetSdk < Build.VERSION_CODES.Q;
+ && mActivityRecord != null && mActivityRecord.mTargetSdk < Build.VERSION_CODES.Q;
}
void setLastExclusionHeights(int side, int requested, int granted) {
@@ -741,7 +741,7 @@
mClient = c;
mAppOp = appOp;
mToken = token;
- mAppToken = mToken.asAppWindowToken();
+ mActivityRecord = mToken.asActivityRecord();
mOwnerUid = ownerId;
mOwnerCanAddInternalSystemWindow = ownerCanAddInternalSystemWindow;
mWindowId = new WindowId(this);
@@ -805,7 +805,7 @@
}
mIsFloatingLayer = mIsImWindow || mIsWallpaper;
- if (mAppToken != null && mAppToken.mShowForAllUsers) {
+ if (mActivityRecord != null && mActivityRecord.mShowForAllUsers) {
// Windows for apps that can show for all users should also show when the device is
// locked.
mAttrs.flags |= FLAG_SHOW_WHEN_LOCKED;
@@ -820,7 +820,8 @@
mLastRequestedHeight = 0;
mLayer = 0;
mInputWindowHandle = new InputWindowHandle(
- mAppToken != null ? mAppToken.mInputApplicationHandle : null, getDisplayId());
+ mActivityRecord != null ? mActivityRecord.mInputApplicationHandle : null,
+ getDisplayId());
}
void attach() {
@@ -835,7 +836,7 @@
*/
boolean inSizeCompatMode() {
return (mAttrs.privateFlags & PRIVATE_FLAG_COMPATIBLE_WINDOW) != 0
- || (mAppToken != null && mAppToken.hasSizeCompatBounds()
+ || (mActivityRecord != null && mActivityRecord.hasSizeCompatBounds()
// Exclude starting window because it is not displayed by the application.
&& mAttrs.type != TYPE_APPLICATION_STARTING);
}
@@ -950,11 +951,11 @@
layoutYDiff = 0;
} else {
mWindowFrames.mContainingFrame.set(getDisplayedBounds());
- if (mAppToken != null && !mAppToken.mFrozenBounds.isEmpty()) {
+ if (mActivityRecord != null && !mActivityRecord.mFrozenBounds.isEmpty()) {
// If the bounds are frozen, we still want to translate the window freely and only
// freeze the size.
- Rect frozen = mAppToken.mFrozenBounds.peek();
+ Rect frozen = mActivityRecord.mFrozenBounds.peek();
mWindowFrames.mContainingFrame.right =
mWindowFrames.mContainingFrame.left + frozen.width();
mWindowFrames.mContainingFrame.bottom =
@@ -1137,8 +1138,8 @@
// TODO: Look into whether this override is still necessary.
@Override
public Rect getBounds() {
- if (mAppToken != null) {
- return mAppToken.getBounds();
+ if (mActivityRecord != null) {
+ return mActivityRecord.getBounds();
} else {
return super.getBounds();
}
@@ -1239,12 +1240,12 @@
@Override
public IApplicationToken getAppToken() {
- return mAppToken != null ? mAppToken.appToken : null;
+ return mActivityRecord != null ? mActivityRecord.appToken : null;
}
@Override
public boolean isVoiceInteraction() {
- return mAppToken != null && mAppToken.mVoiceInteraction;
+ return mActivityRecord != null && mActivityRecord.mVoiceInteraction;
}
boolean setReportResizeHints() {
@@ -1303,8 +1304,8 @@
// If it's a dead window left on screen, and the configuration changed, there is nothing
// we can do about it. Remove the window now.
- if (mAppToken != null && mAppDied) {
- mAppToken.removeDeadWindows();
+ if (mActivityRecord != null && mAppDied) {
+ mActivityRecord.removeDeadWindows();
return;
}
@@ -1328,8 +1329,8 @@
this, winAnimator.mSurfaceController);
}
winAnimator.mDrawState = DRAW_PENDING;
- if (mAppToken != null) {
- mAppToken.clearAllDrawn();
+ if (mActivityRecord != null) {
+ mActivityRecord.clearAllDrawn();
}
}
if (!mWmService.mResizingWindows.contains(this)) {
@@ -1401,7 +1402,7 @@
}
Task getTask() {
- return mAppToken != null ? mAppToken.getTask() : null;
+ return mActivityRecord != null ? mActivityRecord.getTask() : null;
}
TaskStack getStack() {
@@ -1450,14 +1451,14 @@
}
public long getInputDispatchingTimeoutNanos() {
- return mAppToken != null
- ? mAppToken.mInputDispatchingTimeoutNanos
+ return mActivityRecord != null
+ ? mActivityRecord.mInputDispatchingTimeoutNanos
: WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;
}
@Override
public boolean hasAppShownWindows() {
- return mAppToken != null && (mAppToken.firstWindowDrawn || mAppToken.startingDisplayed);
+ return mActivityRecord != null && (mActivityRecord.firstWindowDrawn || mActivityRecord.startingDisplayed);
}
boolean isIdentityMatrix(float dsdx, float dtdx, float dsdy, float dtdy) {
@@ -1537,7 +1538,7 @@
*/
// TODO: Can we consolidate this with #isVisible() or have a more appropriate name for this?
boolean isWinVisibleLw() {
- return (mAppToken == null || !mAppToken.hiddenRequested || mAppToken.isSelfAnimating())
+ return (mActivityRecord == null || !mActivityRecord.hiddenRequested || mActivityRecord.isSelfAnimating())
&& isVisible();
}
@@ -1565,7 +1566,7 @@
* call to IWindowSession.add() and the first relayout().
*/
boolean isVisibleOrAdding() {
- final AppWindowToken atoken = mAppToken;
+ final ActivityRecord atoken = mActivityRecord;
return (mHasSurface || (!mRelayoutCalled && mViewVisibility == View.VISIBLE))
&& isVisibleByPolicy() && !isParentWindowHidden()
&& (atoken == null || !atoken.hiddenRequested)
@@ -1581,7 +1582,7 @@
if (!mHasSurface || mDestroying || !isVisibleByPolicy()) {
return false;
}
- final AppWindowToken atoken = mAppToken;
+ final ActivityRecord atoken = mActivityRecord;
if (atoken != null) {
return ((!isParentWindowHidden() && !atoken.hiddenRequested)
|| isAnimating());
@@ -1605,8 +1606,8 @@
* it must be drawn before allDrawn can become true.
*/
boolean isInteresting() {
- return mAppToken != null && !mAppDied
- && (!mAppToken.isFreezingScreen() || !mAppFreezing)
+ return mActivityRecord != null && !mAppDied
+ && (!mActivityRecord.isFreezingScreen() || !mAppFreezing)
&& mViewVisibility == View.VISIBLE;
}
@@ -1631,14 +1632,14 @@
if (translucent) {
return false;
}
- if (mAppToken == null) {
+ if (mActivityRecord == null) {
final boolean shown = mWinAnimator.getShown();
final boolean exiting = mAnimatingExit || mDestroying;
return shown && !exiting;
} else {
final Task task = getTask();
final boolean canFromTask = task != null && task.canAffectSystemUiFlags();
- return canFromTask && !mAppToken.isHidden();
+ return canFromTask && !mActivityRecord.isHidden();
}
}
@@ -1648,7 +1649,7 @@
*/
@Override
public boolean isDisplayedLw() {
- final AppWindowToken atoken = mAppToken;
+ final ActivityRecord atoken = mActivityRecord;
return isDrawnLw() && isVisibleByPolicy()
&& ((!isParentWindowHidden() && (atoken == null || !atoken.hiddenRequested))
|| isAnimating());
@@ -1664,7 +1665,7 @@
@Override
public boolean isGoneForLayoutLw() {
- final AppWindowToken atoken = mAppToken;
+ final ActivityRecord atoken = mActivityRecord;
return mViewVisibility == View.GONE
|| !mRelayoutCalled
|| (atoken == null && mToken.isHidden())
@@ -1727,7 +1728,7 @@
// Starting window that's exiting will be removed when the animation finishes.
// Mark all relevant flags for that onExitAnimationDone will proceed all the way
// to actually remove it.
- if (!visible && isVisibleNow() && mAppToken.isSelfAnimating()) {
+ if (!visible && isVisibleNow() && mActivityRecord.isSelfAnimating()) {
mAnimatingExit = true;
mRemoveOnExit = true;
mWindowRemovalAllowed = true;
@@ -2004,8 +2005,8 @@
+ "callers=%s",
this, mWinAnimator.mSurfaceController, mAnimatingExit, mRemoveOnExit,
mHasSurface, mWinAnimator.getShown(), isAnimating(),
- mAppToken != null && mAppToken.isSelfAnimating(), mWillReplaceWindow,
- mAppToken != null && mAppToken.inPendingTransaction,
+ mActivityRecord != null && mActivityRecord.isSelfAnimating(), mWillReplaceWindow,
+ mActivityRecord != null && mActivityRecord.inPendingTransaction,
mWmService.mDisplayFrozen, Debug.getCallers(6));
// Visibility of the removed window. Will be used later to update orientation later on.
@@ -2064,9 +2065,9 @@
}
}
final boolean isAnimating = isAnimating()
- && (mAppToken == null || !mAppToken.isWaitingForTransitionStart());
- final boolean lastWindowIsStartingWindow = startingWindow && mAppToken != null
- && mAppToken.isLastWindow(this);
+ && (mActivityRecord == null || !mActivityRecord.isWaitingForTransitionStart());
+ final boolean lastWindowIsStartingWindow = startingWindow && mActivityRecord != null
+ && mActivityRecord.isLastWindow(this);
// We delay the removal of a window if it has a showing surface that can be used to run
// exit animation and it is marked as exiting.
// Also, If isn't the an animating starting window that is the last window in the app.
@@ -2078,8 +2079,8 @@
ProtoLog.v(WM_DEBUG_ADD_REMOVE,
"Not removing %s due to exit animation", this);
setupWindowForRemoveOnExit();
- if (mAppToken != null) {
- mAppToken.updateReportedVisibilityLocked();
+ if (mActivityRecord != null) {
+ mActivityRecord.updateReportedVisibilityLocked();
}
return;
}
@@ -2127,7 +2128,7 @@
return false;
}
- final boolean windowsAreFocusable = mAppToken == null || mAppToken.windowsAreFocusable();
+ final boolean windowsAreFocusable = mActivityRecord == null || mActivityRecord.windowsAreFocusable();
if (!windowsAreFocusable) {
// This window can't be an IME target if the app's windows should not be focusable.
return false;
@@ -2160,8 +2161,8 @@
+ " policyVisAfterAnim=" + mLegacyPolicyVisibilityAfterAnim
+ " parentHidden=" + isParentWindowHidden()
+ " exiting=" + mAnimatingExit + " destroying=" + mDestroying);
- if (mAppToken != null) {
- Slog.i(TAG_WM, " mAppToken.hiddenRequested=" + mAppToken.hiddenRequested);
+ if (mActivityRecord != null) {
+ Slog.i(TAG_WM, " mActivityRecord.hiddenRequested=" + mActivityRecord.hiddenRequested);
}
}
}
@@ -2306,8 +2307,8 @@
final Region region = inputWindowHandle.touchableRegion;
setTouchableRegionCropIfNeeded(inputWindowHandle);
- final Rect appOverrideBounds = mAppToken != null
- ? mAppToken.getResolvedOverrideBounds() : null;
+ final Rect appOverrideBounds = mActivityRecord != null
+ ? mActivityRecord.getResolvedOverrideBounds() : null;
if (appOverrideBounds != null && !appOverrideBounds.isEmpty()) {
// There may have touchable letterboxes around the activity, so in order to let the
// letterboxes are able to receive touch event and slip to activity, the activity with
@@ -2320,22 +2321,22 @@
// Non-modal uses the application based frame.
mTmpRect.set(mWindowFrames.mCompatFrame);
}
- // The offset of compatibility bounds is applied to surface of {@link #AppWindowToken}
+ // The offset of compatibility bounds is applied to surface of {@link #ActivityRecord}
// and frame, so it is unnecessary to translate twice in surface based coordinates.
- final int surfaceOffsetX = mAppToken.hasSizeCompatBounds()
- ? mAppToken.getBounds().left : 0;
+ final int surfaceOffsetX = mActivityRecord.hasSizeCompatBounds()
+ ? mActivityRecord.getBounds().left : 0;
mTmpRect.offset(surfaceOffsetX - mWindowFrames.mFrame.left, -mWindowFrames.mFrame.top);
region.set(mTmpRect);
return flags;
}
- if (modal && mAppToken != null) {
+ if (modal && mActivityRecord != null) {
// Limit the outer touch to the activity stack region.
flags |= FLAG_NOT_TOUCH_MODAL;
// If the inner bounds of letterbox is available, then it will be used as the touchable
// region so it won't cover the touchable letterbox and the touch events can slip to
// activity from letterbox.
- mAppToken.getLetterboxInnerBounds(mTmpRect);
+ mActivityRecord.getLetterboxInnerBounds(mTmpRect);
if (mTmpRect.isEmpty()) {
// If this is a modal window we need to dismiss it if it's not full screen and the
// touch happens outside of the frame that displays the content. This means we need
@@ -2426,7 +2427,7 @@
void prepareWindowToDisplayDuringRelayout(boolean wasVisible) {
// We need to turn on screen regardless of visibility.
final boolean hasTurnScreenOnFlag = (mAttrs.flags & FLAG_TURN_SCREEN_ON) != 0
- || (mAppToken != null && mAppToken.canTurnScreenOn());
+ || (mActivityRecord != null && mActivityRecord.canTurnScreenOn());
// The screen will turn on if the following conditions are met
// 1. The window has the flag FLAG_TURN_SCREEN_ON or ActivityRecord#canTurnScreenOn.
@@ -2443,7 +2444,7 @@
boolean allowTheaterMode = mWmService.mAllowTheaterModeWakeFromLayout
|| Settings.Global.getInt(mWmService.mContext.getContentResolver(),
Settings.Global.THEATER_MODE_ON, 0) == 0;
- boolean canTurnScreenOn = mAppToken == null || mAppToken.currentLaunchCanTurnScreenOn();
+ boolean canTurnScreenOn = mActivityRecord == null || mActivityRecord.currentLaunchCanTurnScreenOn();
if (allowTheaterMode && canTurnScreenOn && !mPowerManagerWrapper.isInteractive()) {
if (DEBUG_VISIBILITY || DEBUG_POWER) {
@@ -2453,8 +2454,8 @@
PowerManager.WAKE_REASON_APPLICATION, "android.server.wm:SCREEN_ON_FLAG");
}
- if (mAppToken != null) {
- mAppToken.setCurrentLaunchCanTurnScreenOn(false);
+ if (mActivityRecord != null) {
+ mActivityRecord.setCurrentLaunchCanTurnScreenOn(false);
}
}
@@ -2505,14 +2506,14 @@
}
void adjustStartingWindowFlags() {
- if (mAttrs.type == TYPE_BASE_APPLICATION && mAppToken != null
- && mAppToken.startingWindow != null) {
+ if (mAttrs.type == TYPE_BASE_APPLICATION && mActivityRecord != null
+ && mActivityRecord.startingWindow != null) {
// Special handling of starting window over the base
// window of the app: propagate lock screen flags to it,
// to provide the correct semantics while starting.
final int mask = FLAG_SHOW_WHEN_LOCKED | FLAG_DISMISS_KEYGUARD
| FLAG_ALLOW_LOCK_WHILE_SCREEN_ON;
- WindowManager.LayoutParams sa = mAppToken.startingWindow.mAttrs;
+ WindowManager.LayoutParams sa = mActivityRecord.startingWindow.mAttrs;
sa.flags = (sa.flags & ~mask) | (mAttrs.flags & mask);
}
}
@@ -2544,8 +2545,8 @@
Slog.i(TAG, "WIN DEATH: " + win);
if (win != null) {
final DisplayContent dc = getDisplayContent();
- if (win.mAppToken != null && win.mAppToken.findMainWindow() == win) {
- mWmService.mTaskSnapshotController.onAppDied(win.mAppToken);
+ if (win.mActivityRecord != null && win.mActivityRecord.findMainWindow() == win) {
+ mWmService.mTaskSnapshotController.onAppDied(win.mActivityRecord);
}
win.removeIfPossible(shouldKeepVisibleDeadAppWindow());
if (win.mAttrs.type == TYPE_DOCK_DIVIDER) {
@@ -2587,7 +2588,7 @@
* interacts with it.
*/
private boolean shouldKeepVisibleDeadAppWindow() {
- if (!isWinVisibleLw() || mAppToken == null || mAppToken.isClientHidden()) {
+ if (!isWinVisibleLw() || mActivityRecord == null || mActivityRecord.isClientHidden()) {
// Not a visible app window or the app isn't dead.
return false;
}
@@ -2612,26 +2613,26 @@
return isVisibleOrAdding()
&& (mViewVisibility == View.VISIBLE) && !mRemoveOnExit
&& ((mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0)
- && (mAppToken == null || mAppToken.windowsAreFocusable())
+ && (mActivityRecord == null || mActivityRecord.windowsAreFocusable())
&& !cantReceiveTouchInput();
}
@Override
public boolean canShowWhenLocked() {
final boolean showBecauseOfActivity =
- mAppToken != null && mAppToken.canShowWhenLocked();
+ mActivityRecord != null && mActivityRecord.canShowWhenLocked();
final boolean showBecauseOfWindow = (getAttrs().flags & FLAG_SHOW_WHEN_LOCKED) != 0;
return showBecauseOfActivity || showBecauseOfWindow;
}
/** @return false if this window desires touch events. */
boolean cantReceiveTouchInput() {
- if (mAppToken == null || mAppToken.getTask() == null) {
+ if (mActivityRecord == null || mActivityRecord.getTask() == null) {
return false;
}
- return mAppToken.getTask().mStack.shouldIgnoreInput()
- || mAppToken.hiddenRequested
+ return mActivityRecord.getTask().mStack.shouldIgnoreInput()
+ || mActivityRecord.hiddenRequested
|| isAnimatingToRecents();
}
@@ -2643,7 +2644,7 @@
mWmService.getRecentsAnimationController();
return recentsAnimationController != null
&& recentsAnimationController.isAnimatingTask(getTask())
- && !recentsAnimationController.isTargetApp(mAppToken);
+ && !recentsAnimationController.isTargetApp(mActivityRecord);
}
@Override
@@ -2883,7 +2884,7 @@
}
boolean isClosing() {
- return mAnimatingExit || (mAppToken != null && mAppToken.isClosingOrEnteringPip());
+ return mAnimatingExit || (mActivityRecord != null && mActivityRecord.isClosingOrEnteringPip());
}
void addWinAnimatorToList(ArrayList<WindowStateAnimator> animators) {
@@ -2898,7 +2899,7 @@
void sendAppVisibilityToClients() {
super.sendAppVisibilityToClients();
- final boolean clientHidden = mAppToken.isClientHidden();
+ final boolean clientHidden = mActivityRecord.isClientHidden();
if (mAttrs.type == TYPE_APPLICATION_STARTING && clientHidden) {
// Don't hide the starting window.
return;
@@ -2993,10 +2994,10 @@
mDestroying = false;
destroyedSomething = true;
- // Since mDestroying will affect AppWindowToken#allDrawn, we need to perform another
+ // Since mDestroying will affect ActivityRecord#allDrawn, we need to perform another
// traversal in case we are waiting on this window to start the transition.
if (getDisplayContent().mAppTransition.isTransitionSet()
- && getDisplayContent().mOpeningApps.contains(mAppToken)) {
+ && getDisplayContent().mOpeningApps.contains(mActivityRecord)) {
mWmService.mWindowPlacerLocked.requestTraversal();
}
}
@@ -3076,7 +3077,7 @@
// Child windows are evaluated based on their parent window.
final WindowState win = getTopParentWindow();
if (win.mAttrs.type < FIRST_SYSTEM_WINDOW
- && win.mAppToken != null && win.mAppToken.mShowForAllUsers) {
+ && win.mActivityRecord != null && win.mActivityRecord.mShowForAllUsers) {
// All window frames that are fullscreen extend above status bar, but some don't extend
// below navigation bar. Thus, check for display frame for top/left and stable frame for
@@ -3216,8 +3217,8 @@
@Override
public Configuration getConfiguration() {
- if (mAppToken != null && mAppToken.mFrozenMergedConfig.size() > 0) {
- return mAppToken.mFrozenMergedConfig.peek();
+ if (mActivityRecord != null && mActivityRecord.mFrozenMergedConfig.size() > 0) {
+ return mActivityRecord.mFrozenMergedConfig.peek();
}
// If the process has not registered to any display to listen to the configuration change,
@@ -3453,7 +3454,7 @@
/** Is this window in a container that takes up the entire screen space? */
private boolean inAppWindowThatMatchesParentBounds() {
- return mAppToken == null || (mAppToken.matchParentBounds() && !inMultiWindowMode());
+ return mActivityRecord == null || (mActivityRecord.matchParentBounds() && !inMultiWindowMode());
}
/** @return true when the window is in fullscreen mode, but has non-fullscreen bounds set, or
@@ -3465,8 +3466,8 @@
@Override
public boolean isLetterboxedForDisplayCutoutLw() {
- if (mAppToken == null) {
- // Only windows with an AppWindowToken are letterboxed.
+ if (mActivityRecord == null) {
+ // Only windows with an ActivityRecord are letterboxed.
return false;
}
if (!mWindowFrames.parentFrameWasClippedByDisplayCutout()) {
@@ -3491,14 +3492,14 @@
* @throws NullPointerException if there is no app window token for this window
*/
private boolean frameCoversEntireAppTokenBounds() {
- mTmpRect.set(mAppToken.getBounds());
+ mTmpRect.set(mActivityRecord.getBounds());
mTmpRect.intersectUnchecked(mWindowFrames.mFrame);
- return mAppToken.getBounds().equals(mTmpRect);
+ return mActivityRecord.getBounds().equals(mTmpRect);
}
@Override
public boolean isLetterboxedOverlappingWith(Rect rect) {
- return mAppToken != null && mAppToken.isLetterboxOverlappingWith(rect);
+ return mActivityRecord != null && mActivityRecord.isLetterboxOverlappingWith(rect);
}
boolean isDragResizeChanged() {
@@ -3554,7 +3555,7 @@
// simulate that we are still resizing so the app fills the hole with the resizing
// background.
return (getDisplayContent().mDividerControllerLocked.isResizing()
- || mAppToken != null && !mAppToken.mFrozenBounds.isEmpty()) &&
+ || mActivityRecord != null && !mActivityRecord.mFrozenBounds.isEmpty()) &&
!task.inFreeformWindowingMode() && !isGoneForLayoutLw();
}
@@ -3674,8 +3675,8 @@
}
if (dumpAll) {
pw.println(prefix + "mToken=" + mToken);
- if (mAppToken != null) {
- pw.println(prefix + "mAppToken=" + mAppToken);
+ if (mActivityRecord != null) {
+ pw.println(prefix + "mActivityRecord=" + mActivityRecord);
pw.print(prefix + "mAppDied=" + mAppDied);
pw.print(prefix + "drawnStateEvaluated=" + getDrawnStateEvaluated());
pw.println(prefix + "mightAffectAllDrawn=" + mightAffectAllDrawn());
@@ -4077,8 +4078,8 @@
@Override
public int getRotationAnimationHint() {
- if (mAppToken != null) {
- return mAppToken.mRotationAnimationHint;
+ if (mActivityRecord != null) {
+ return mActivityRecord.mRotationAnimationHint;
} else {
return -1;
}
@@ -4101,8 +4102,8 @@
final int drawState = mWinAnimator.mDrawState;
if ((drawState == HAS_DRAWN || drawState == READY_TO_SHOW)
- && mAttrs.type != TYPE_APPLICATION_STARTING && mAppToken != null) {
- mAppToken.onFirstWindowDrawn(this, mWinAnimator);
+ && mAttrs.type != TYPE_APPLICATION_STARTING && mActivityRecord != null) {
+ mActivityRecord.onFirstWindowDrawn(this, mWinAnimator);
}
if (mWinAnimator.mDrawState != READY_TO_SHOW || !isReadyForDisplay()) {
@@ -4156,11 +4157,11 @@
+ " during animation: policyVis=" + isVisibleByPolicy()
+ " parentHidden=" + isParentWindowHidden()
+ " tok.hiddenRequested="
- + (mAppToken != null && mAppToken.hiddenRequested)
- + " tok.hidden=" + (mAppToken != null && mAppToken.isHidden())
+ + (mActivityRecord != null && mActivityRecord.hiddenRequested)
+ + " tok.hidden=" + (mActivityRecord != null && mActivityRecord.isHidden())
+ " animating=" + isAnimating()
+ " tok animating="
- + (mAppToken != null && mAppToken.isSelfAnimating())
+ + (mActivityRecord != null && mActivityRecord.isSelfAnimating())
+ " Callers=" + Debug.getCallers(4));
}
}
@@ -4171,8 +4172,8 @@
windowInfo.type = mAttrs.type;
windowInfo.layer = mLayer;
windowInfo.token = mClient.asBinder();
- if (mAppToken != null) {
- windowInfo.activityToken = mAppToken.appToken.asBinder();
+ if (mActivityRecord != null) {
+ windowInfo.activityToken = mActivityRecord.appToken.asBinder();
}
windowInfo.title = mAttrs.accessibilityTitle;
// Panel windows have no public way to set the a11y title directly. Use the
@@ -4402,7 +4403,7 @@
mWmService.requestTraversal();
// System windows don't have an activity and an app token as a result, but need a way
// to be informed about their entrance animation end.
- if (mAppToken == null) {
+ if (mActivityRecord == null) {
try {
mClient.dispatchWindowShown();
} catch (RemoteException e) {
@@ -4436,8 +4437,8 @@
// care to ensure the activity has actually stopped and the surface is not still in use.
// Otherwise we add the service to mDestroySurface and allow it to be processed in our next
// transaction.
- if (mAppToken != null) {
- mAppToken.destroySurfaces();
+ if (mActivityRecord != null) {
+ mActivityRecord.destroySurfaces();
} else {
if (hasSurface) {
mWmService.mDestroySurface.add(this);
@@ -4564,7 +4565,7 @@
+ " pv=" + isVisibleByPolicy()
+ " mDrawState=" + mWinAnimator.mDrawState
+ " ph=" + isParentWindowHidden()
- + " th=" + (mAppToken != null ? mAppToken.hiddenRequested : false)
+ + " th=" + (mActivityRecord != null ? mActivityRecord.hiddenRequested : false)
+ " a=" + isAnimating());
}
}
@@ -4590,7 +4591,7 @@
}
// But if we have a frame, and are an application window, then we must be cropped.
- if (mAppToken != null) {
+ if (mActivityRecord != null) {
return false;
}
@@ -4905,9 +4906,9 @@
outMatrix.setValues(float9);
}
- // TODO: Hack to work around the number of states AppWindowToken needs to access without having
+ // TODO: Hack to work around the number of states ActivityRecord needs to access without having
// access to its windows children. Need to investigate re-writing
- // {@link AppWindowToken#updateReportedVisibilityLocked} so this can be removed.
+ // {@link ActivityRecord#updateReportedVisibilityLocked} so this can be removed.
static final class UpdateReportedVisibilityResults {
int numInteresting;
int numVisible;
@@ -4989,9 +4990,9 @@
boolean needsZBoost() {
final WindowState inputMethodTarget = getDisplayContent().mInputMethodTarget;
if (mIsImWindow && inputMethodTarget != null) {
- final AppWindowToken appToken = inputMethodTarget.mAppToken;
- if (appToken != null) {
- return appToken.needsZBoost();
+ final ActivityRecord activity = inputMethodTarget.mActivityRecord;
+ if (activity != null) {
+ return activity.needsZBoost();
}
}
return mWillReplaceWindow;
@@ -5131,7 +5132,7 @@
if (getParentWindow().isInputMethodTarget()) {
return true;
}
- } else if (mAppToken != null) {
+ } else if (mActivityRecord != null) {
// Likewise if we share a token with the Input method target and are ordered
// above it but not necessarily a child (e.g. a Dialog) then we also need
// this promotion.
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index eac372f..3f25f89 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -266,7 +266,7 @@
if (DEBUG_ANIM) Slog.v(
TAG, "Animation done in " + this + ": exiting=" + mWin.mAnimatingExit
+ ", reportedVisible="
- + (mWin.mAppToken != null ? mWin.mAppToken.reportedVisible : false));
+ + (mWin.mActivityRecord != null ? mWin.mActivityRecord.reportedVisible : false));
mWin.checkPolicyVisibilityChange();
final DisplayContent displayContent = mWin.getDisplayContent();
@@ -285,8 +285,8 @@
"WindowStateAnimator", displayContent.pendingLayoutChanges);
}
- if (mWin.mAppToken != null) {
- mWin.mAppToken.updateReportedVisibilityLocked();
+ if (mWin.mActivityRecord != null) {
+ mWin.mActivityRecord.updateReportedVisibilityLocked();
}
}
@@ -358,8 +358,8 @@
}
mDrawState = READY_TO_SHOW;
boolean result = false;
- final AppWindowToken atoken = mWin.mAppToken;
- if (atoken == null || atoken.canShowWindows()
+ final ActivityRecord activity = mWin.mActivityRecord;
+ if (activity == null || activity.canShowWindows()
|| mWin.mAttrs.type == TYPE_APPLICATION_STARTING) {
result = mWin.performShowLocked();
}
@@ -409,7 +409,7 @@
// we are just doing an in-place switch. In that case any SurfaceFlinger side
// child layers need to be reparented to the new surface to make this
// transparent to the app.
- if (mWin.mAppToken == null || mWin.mAppToken.isRelaunching() == false) {
+ if (mWin.mActivityRecord == null || mWin.mActivityRecord.isRelaunching() == false) {
mPostDrawTransaction.reparentChildren(mPendingDestroySurface.mSurfaceControl,
mSurfaceController.mSurfaceControl)
.apply();
@@ -431,16 +431,16 @@
void resetDrawState() {
mDrawState = DRAW_PENDING;
- if (mWin.mAppToken == null) {
+ if (mWin.mActivityRecord == null) {
return;
}
- if (!mWin.mAppToken.isSelfAnimating()) {
- mWin.mAppToken.clearAllDrawn();
+ if (!mWin.mActivityRecord.isSelfAnimating()) {
+ mWin.mActivityRecord.clearAllDrawn();
} else {
// Currently animating, persist current state of allDrawn until animation
// is complete.
- mWin.mAppToken.deferClearAllDrawn = true;
+ mWin.mActivityRecord.deferClearAllDrawn = true;
}
}
@@ -588,10 +588,10 @@
}
void destroySurfaceLocked() {
- final AppWindowToken wtoken = mWin.mAppToken;
- if (wtoken != null) {
- if (mWin == wtoken.startingWindow) {
- wtoken.startingDisplayed = false;
+ final ActivityRecord activity = mWin.mActivityRecord;
+ if (activity != null) {
+ if (mWin == activity.startingWindow) {
+ activity.startingDisplayed = false;
}
}
diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java
index 5b362c3..ad71237 100644
--- a/services/core/java/com/android/server/wm/WindowToken.java
+++ b/services/core/java/com/android/server/wm/WindowToken.java
@@ -243,7 +243,7 @@
return false;
}
- AppWindowToken asAppWindowToken() {
+ ActivityRecord asActivityRecord() {
// TODO: Not sure if this is the best way to handle this vs. using instanceof and casting.
// I am not an app window token!
return null;
diff --git a/services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java b/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java
similarity index 69%
rename from services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java
rename to services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java
index 5cd649f..77f9f04 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AnimatingAppWindowTokenRegistryTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AnimatingActivityRegistryTest.java
@@ -39,11 +39,11 @@
* Tests for the {@link TaskStack} class.
*
* Build/Install/Run:
- * atest FrameworksServicesTests:AnimatingAppWindowTokenRegistryTest
+ * atest FrameworksServicesTests:AnimatingActivityRegistryTest
*/
@SmallTest
@Presubmit
-public class AnimatingAppWindowTokenRegistryTest extends WindowTestsBase {
+public class AnimatingActivityRegistryTest extends WindowTestsBase {
@Mock
AnimationAdapter mAdapter;
@@ -60,22 +60,22 @@
@Test
public void testDeferring() {
- final AppWindowToken window1 = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity1 = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final AppWindowToken window2 = createAppWindow(window1.getTask(), ACTIVITY_TYPE_STANDARD,
- "window2").mAppToken;
- final AnimatingAppWindowTokenRegistry registry =
- window1.getStack().getAnimatingAppWindowTokenRegistry();
+ final ActivityRecord activity2 = createAppWindow(activity1.getTask(), ACTIVITY_TYPE_STANDARD,
+ "activity2").mActivityRecord;
+ final AnimatingActivityRegistry registry =
+ activity1.getStack().getAnimatingActivityRegistry();
- window1.startAnimation(window1.getPendingTransaction(), mAdapter, false /* hidden */);
- window2.startAnimation(window1.getPendingTransaction(), mAdapter, false /* hidden */);
- assertTrue(window1.isSelfAnimating());
- assertTrue(window2.isSelfAnimating());
+ activity1.startAnimation(activity1.getPendingTransaction(), mAdapter, false /* hidden */);
+ activity2.startAnimation(activity1.getPendingTransaction(), mAdapter, false /* hidden */);
+ assertTrue(activity1.isSelfAnimating());
+ assertTrue(activity2.isSelfAnimating());
// Make sure that first animation finish is deferred, second one is not deferred, and first
// one gets cancelled.
- assertTrue(registry.notifyAboutToFinish(window1, mMockEndDeferFinishCallback1));
- assertFalse(registry.notifyAboutToFinish(window2, mMockEndDeferFinishCallback2));
+ assertTrue(registry.notifyAboutToFinish(activity1, mMockEndDeferFinishCallback1));
+ assertFalse(registry.notifyAboutToFinish(activity2, mMockEndDeferFinishCallback2));
verify(mMockEndDeferFinishCallback1).run();
verifyZeroInteractions(mMockEndDeferFinishCallback2);
}
@@ -83,12 +83,12 @@
@Test
@FlakyTest(bugId = 131005232)
public void testContainerRemoved() {
- final AppWindowToken window1 = createAppWindowToken(mDisplayContent,
+ final ActivityRecord window1 = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final AppWindowToken window2 = createAppWindow(window1.getTask(), ACTIVITY_TYPE_STANDARD,
- "window2").mAppToken;
- final AnimatingAppWindowTokenRegistry registry =
- window1.getStack().getAnimatingAppWindowTokenRegistry();
+ final ActivityRecord window2 = createAppWindow(window1.getTask(), ACTIVITY_TYPE_STANDARD,
+ "window2").mActivityRecord;
+ final AnimatingActivityRegistry registry =
+ window1.getStack().getAnimatingActivityRegistry();
window1.startAnimation(window1.getPendingTransaction(), mAdapter, false /* hidden */);
window2.startAnimation(window1.getPendingTransaction(), mAdapter, false /* hidden */);
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
index b174251..7449efd 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
@@ -57,14 +57,14 @@
private TaskStack mStack;
private Task mTask;
- private ActivityRecord mToken;
+ private ActivityRecord mActivity;
public void setUpOnDisplay(DisplayContent dc) {
mStack = createTaskStackOnDisplay(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, dc);
mTask = createTaskInStack(mStack, 0 /* userId */);
- mToken = WindowTestUtils.createTestAppWindowToken(dc);
+ mActivity = WindowTestUtils.createTestActivityRecord(dc);
- mTask.addChild(mToken, 0);
+ mTask.addChild(mActivity, 0);
// Set a remote animator with snapshot disabled. Snapshots don't work in wmtests.
RemoteAnimationDefinition definition = new RemoteAnimationDefinition();
@@ -110,11 +110,11 @@
// Verify we are in a change transition, but without a snapshot.
// Though, the test will actually have crashed by now if a snapshot is attempted.
- assertNull(mToken.getThumbnail());
- assertTrue(mToken.isInChangeTransition());
+ assertNull(mActivity.getThumbnail());
+ assertTrue(mActivity.isInChangeTransition());
waitUntilHandlersIdle();
- mToken.removeImmediately();
+ mActivity.removeImmediately();
}
@Test
@@ -125,16 +125,16 @@
mTask.setWindowingMode(WINDOWING_MODE_FREEFORM);
assertEquals(1, mDisplayContent.mChangingApps.size());
- assertTrue(mToken.isInChangeTransition());
+ assertTrue(mActivity.isInChangeTransition());
// Removing the app-token from the display should clean-up the
// the change leash.
- mDisplayContent.removeAppToken(mToken.token);
+ mDisplayContent.removeAppToken(mActivity.token);
assertEquals(0, mDisplayContent.mChangingApps.size());
- assertFalse(mToken.isInChangeTransition());
+ assertFalse(mActivity.isInChangeTransition());
waitUntilHandlersIdle();
- mToken.removeImmediately();
+ mActivity.removeImmediately();
}
@Test
@@ -155,11 +155,11 @@
assertEquals(WINDOWING_MODE_FULLSCREEN, mTask.getWindowingMode());
// Make sure we're not waiting for a change animation (no leash)
- assertFalse(mToken.isInChangeTransition());
- assertNull(mToken.getThumbnail());
+ assertFalse(mActivity.isInChangeTransition());
+ assertNull(mActivity.getThumbnail());
waitUntilHandlersIdle();
- mToken.removeImmediately();
+ mActivity.removeImmediately();
}
@Test
@@ -169,14 +169,14 @@
mTask.setWindowingMode(WINDOWING_MODE_FREEFORM);
assertEquals(1, mDisplayContent.mChangingApps.size());
- assertTrue(mToken.isInChangeTransition());
+ assertTrue(mActivity.isInChangeTransition());
// Changing visibility should cancel the change transition and become closing
- mToken.setVisibility(false, false);
+ mActivity.setVisibility(false, false);
assertEquals(0, mDisplayContent.mChangingApps.size());
- assertFalse(mToken.isInChangeTransition());
+ assertFalse(mActivity.isInChangeTransition());
waitUntilHandlersIdle();
- mToken.removeImmediately();
+ mActivity.removeImmediately();
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
index 14939cc..6020453 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
@@ -57,9 +57,9 @@
@Test
@FlakyTest(bugId = 131005232)
public void testTranslucentOpen() {
- final AppWindowToken behind = createAppWindowToken(mDisplayContent,
+ final ActivityRecord behind = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final AppWindowToken translucentOpening = createAppWindowToken(mDisplayContent,
+ final ActivityRecord translucentOpening = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
translucentOpening.setOccludesParent(false);
translucentOpening.setHidden(true);
@@ -72,9 +72,9 @@
@Test
@FlakyTest(bugId = 131005232)
public void testTranslucentClose() {
- final AppWindowToken behind = createAppWindowToken(mDisplayContent,
+ final ActivityRecord behind = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final AppWindowToken translucentClosing = createAppWindowToken(mDisplayContent,
+ final ActivityRecord translucentClosing = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
translucentClosing.setOccludesParent(false);
mDisplayContent.mClosingApps.add(translucentClosing);
@@ -85,9 +85,9 @@
@Test
@FlakyTest(bugId = 131005232)
public void testChangeIsNotOverwritten() {
- final AppWindowToken behind = createAppWindowToken(mDisplayContent,
+ final ActivityRecord behind = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final AppWindowToken translucentOpening = createAppWindowToken(mDisplayContent,
+ final ActivityRecord translucentOpening = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
translucentOpening.setOccludesParent(false);
translucentOpening.setHidden(true);
@@ -101,10 +101,10 @@
@Test
@FlakyTest(bugId = 131005232)
public void testTransitWithinTask() {
- final ActivityRecord opening = createAppWindowToken(mDisplayContent,
+ final ActivityRecord opening = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD);
opening.setOccludesParent(false);
- final ActivityRecord closing = createAppWindowToken(mDisplayContent,
+ final ActivityRecord closing = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FREEFORM, ACTIVITY_TYPE_STANDARD);
closing.setOccludesParent(false);
final Task task = opening.getTask();
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
index 9d53676..06afce2 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
@@ -122,14 +122,14 @@
final DisplayContent dc2 = createNewDisplay(Display.STATE_ON);
// Create 2 app window tokens to represent 2 activity window.
- final AppWindowToken token1 = createTestAppWindowToken(dc1,
+ final ActivityRecord activity1 = createTestActivityRecord(dc1,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final AppWindowToken token2 = createTestAppWindowToken(dc2,
+ final ActivityRecord activity2 = createTestActivityRecord(dc2,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- token1.allDrawn = true;
- token1.startingDisplayed = true;
- token1.startingMoved = true;
+ activity1.allDrawn = true;
+ activity1.startingDisplayed = true;
+ activity1.startingMoved = true;
// Simulate activity resume / finish flows to prepare app transition & set visibility,
// make sure transition is set as expected for each display.
@@ -141,8 +141,8 @@
assertEquals(TRANSIT_ACTIVITY_CLOSE, dc2.mAppTransition.getAppTransition());
// One activity window is visible for resuming & the other activity window is invisible
// for finishing in different display.
- token1.setVisibility(true, false);
- token2.setVisibility(false, false);
+ activity1.setVisibility(true, false);
+ activity2.setVisibility(false, false);
// Make sure each display is in animating stage.
assertTrue(dc1.mOpeningApps.size() > 0);
@@ -159,12 +159,12 @@
final TaskStack stack1 = createTaskStackOnDisplay(dc1);
final Task task1 = createTaskInStack(stack1, 0 /* userId */);
- final ActivityRecord token1 =
- WindowTestUtils.createTestAppWindowToken(dc1);
- task1.addChild(token1, 0);
+ final ActivityRecord activity1 =
+ WindowTestUtils.createTestActivityRecord(dc1);
+ task1.addChild(activity1, 0);
// Simulate same app is during opening / closing transition set stage.
- dc1.mClosingApps.add(token1);
+ dc1.mClosingApps.add(activity1);
assertTrue(dc1.mClosingApps.size() > 0);
dc1.prepareAppTransition(TRANSIT_ACTIVITY_OPEN,
@@ -172,15 +172,15 @@
assertEquals(TRANSIT_ACTIVITY_OPEN, dc1.mAppTransition.getAppTransition());
assertTrue(dc1.mAppTransition.isTransitionSet());
- dc1.mOpeningApps.add(token1);
+ dc1.mOpeningApps.add(activity1);
assertTrue(dc1.mOpeningApps.size() > 0);
// Move stack to another display.
stack1.reparent(dc2.getDisplayId(), new Rect(), true);
// Verify if token are cleared from both pending transition list in former display.
- assertFalse(dc1.mOpeningApps.contains(token1));
- assertFalse(dc1.mOpeningApps.contains(token1));
+ assertFalse(dc1.mOpeningApps.contains(activity1));
+ assertFalse(dc1.mOpeningApps.contains(activity1));
}
@Test
@@ -197,7 +197,7 @@
doReturn(false).when(dc).onDescendantOrientationChanged(any(), any());
final WindowState exitingAppWindow = createWindow(null /* parent */, TYPE_BASE_APPLICATION,
dc, "exiting app");
- final AppWindowToken exitingAppToken = exitingAppWindow.mAppToken;
+ final ActivityRecord exitingActivity= exitingAppWindow.mActivityRecord;
// Wait until everything in animation handler get executed to prevent the exiting window
// from being removed during WindowSurfacePlacer Traversal.
waitUntilHandlersIdle();
@@ -215,7 +215,7 @@
false /* alwaysKeepCurrent */, 0 /* flags */, false /* forceOverride */);
assertEquals(TRANSIT_ACTIVITY_CLOSE, dc.mAppTransition.getAppTransition());
dc.mAppTransition.overridePendingAppTransitionRemote(adapter);
- exitingAppToken.setVisibility(false, false);
+ exitingActivity.setVisibility(false, false);
assertTrue(dc.mClosingApps.size() > 0);
// Make sure window is in animating stage before freeze, and cancel after freeze.
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowThumbnailTest.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowThumbnailTest.java
index aacdeb2..8520d21 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppWindowThumbnailTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowThumbnailTest.java
@@ -47,10 +47,10 @@
private AppWindowThumbnail buildThumbnail() {
final GraphicBuffer buffer = GraphicBuffer.create(1, 1, PixelFormat.RGBA_8888,
GraphicBuffer.USAGE_SW_READ_RARELY | GraphicBuffer.USAGE_SW_WRITE_NEVER);
- final AppWindowToken mockAwt = mock(AppWindowToken.class);
- when(mockAwt.getPendingTransaction()).thenReturn(new StubTransaction());
- when(mockAwt.makeSurface()).thenReturn(new MockSurfaceControlBuilder());
- return new AppWindowThumbnail(new StubTransaction(), mockAwt,
+ final ActivityRecord mockAr = mock(ActivityRecord.class);
+ when(mockAr.getPendingTransaction()).thenReturn(new StubTransaction());
+ when(mockAr.makeSurface()).thenReturn(new MockSurfaceControlBuilder());
+ return new AppWindowThumbnail(new StubTransaction(), mockAr,
buffer, false, mock(Surface.class), mock(SurfaceAnimator.class));
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java
index 66ba81d..b0f3b42 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java
@@ -42,7 +42,7 @@
/**
- * Animation related tests for the {@link AppWindowToken} class.
+ * Animation related tests for the {@link ActivityRecord} class.
*
* Build/Install/Run:
* atest AppWindowTokenAnimationTests
@@ -52,7 +52,7 @@
@RunWith(WindowTestRunner.class)
public class AppWindowTokenAnimationTests extends WindowTestsBase {
- private AppWindowToken mToken;
+ private ActivityRecord mActivity;
@Mock
private AnimationAdapter mSpec;
@@ -61,39 +61,39 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- mToken = createTestAppWindowToken(mDisplayContent, WINDOWING_MODE_FULLSCREEN,
+ mActivity = createTestActivityRecord(mDisplayContent, WINDOWING_MODE_FULLSCREEN,
ACTIVITY_TYPE_STANDARD);
}
@Test
@FlakyTest(bugId = 131005232)
public void clipAfterAnim_boundsLayerIsCreated() {
- mToken.mNeedsAnimationBoundsLayer = true;
+ mActivity.mNeedsAnimationBoundsLayer = true;
- mToken.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
- verify(mTransaction).reparent(eq(mToken.getSurfaceControl()),
- eq(mToken.mSurfaceAnimator.mLeash));
- verify(mTransaction).reparent(eq(mToken.mSurfaceAnimator.mLeash),
- eq(mToken.mAnimationBoundsLayer));
+ mActivity.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
+ verify(mTransaction).reparent(eq(mActivity.getSurfaceControl()),
+ eq(mActivity.mSurfaceAnimator.mLeash));
+ verify(mTransaction).reparent(eq(mActivity.mSurfaceAnimator.mLeash),
+ eq(mActivity.mAnimationBoundsLayer));
}
@Test
public void clipAfterAnim_boundsLayerZBoosted() {
- mToken.mNeedsAnimationBoundsLayer = true;
- mToken.mNeedsZBoost = true;
+ mActivity.mNeedsAnimationBoundsLayer = true;
+ mActivity.mNeedsZBoost = true;
- mToken.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
- verify(mTransaction).setLayer(eq(mToken.mAnimationBoundsLayer),
- intThat(layer -> layer >= AppWindowToken.Z_BOOST_BASE));
+ mActivity.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
+ verify(mTransaction).setLayer(eq(mActivity.mAnimationBoundsLayer),
+ intThat(layer -> layer >= ActivityRecord.Z_BOOST_BASE));
}
@Test
@FlakyTest(bugId = 131005232)
public void clipAfterAnim_boundsLayerIsDestroyed() {
- mToken.mNeedsAnimationBoundsLayer = true;
- mToken.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
- final SurfaceControl leash = mToken.mSurfaceAnimator.mLeash;
- final SurfaceControl animationBoundsLayer = mToken.mAnimationBoundsLayer;
+ mActivity.mNeedsAnimationBoundsLayer = true;
+ mActivity.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
+ final SurfaceControl leash = mActivity.mSurfaceAnimator.mLeash;
+ final SurfaceControl animationBoundsLayer = mActivity.mAnimationBoundsLayer;
final ArgumentCaptor<SurfaceAnimator.OnAnimationFinishedCallback> callbackCaptor =
ArgumentCaptor.forClass(
SurfaceAnimator.OnAnimationFinishedCallback.class);
@@ -102,30 +102,30 @@
callbackCaptor.getValue().onAnimationFinished(mSpec);
verify(mTransaction).remove(eq(leash));
verify(mTransaction).remove(eq(animationBoundsLayer));
- assertThat(mToken.mNeedsAnimationBoundsLayer).isFalse();
+ assertThat(mActivity.mNeedsAnimationBoundsLayer).isFalse();
}
@Test
public void clipAfterAnimCancelled_boundsLayerIsDestroyed() {
- mToken.mNeedsAnimationBoundsLayer = true;
- mToken.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
- final SurfaceControl leash = mToken.mSurfaceAnimator.mLeash;
- final SurfaceControl animationBoundsLayer = mToken.mAnimationBoundsLayer;
+ mActivity.mNeedsAnimationBoundsLayer = true;
+ mActivity.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
+ final SurfaceControl leash = mActivity.mSurfaceAnimator.mLeash;
+ final SurfaceControl animationBoundsLayer = mActivity.mAnimationBoundsLayer;
- mToken.mSurfaceAnimator.cancelAnimation();
+ mActivity.mSurfaceAnimator.cancelAnimation();
verify(mTransaction).remove(eq(leash));
verify(mTransaction).remove(eq(animationBoundsLayer));
- assertThat(mToken.mNeedsAnimationBoundsLayer).isFalse();
+ assertThat(mActivity.mNeedsAnimationBoundsLayer).isFalse();
}
@Test
@FlakyTest(bugId = 131005232)
public void clipNoneAnim_boundsLayerIsNotCreated() {
- mToken.mNeedsAnimationBoundsLayer = false;
+ mActivity.mNeedsAnimationBoundsLayer = false;
- mToken.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
- verify(mTransaction).reparent(eq(mToken.getSurfaceControl()),
- eq(mToken.mSurfaceAnimator.mLeash));
- assertThat(mToken.mAnimationBoundsLayer).isNull();
+ mActivity.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */);
+ verify(mTransaction).reparent(eq(mActivity.getSurfaceControl()),
+ eq(mActivity.mSurfaceAnimator.mLeash));
+ assertThat(mActivity.mAnimationBoundsLayer).isNull();
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java
index b4c978f..d68aef0 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java
@@ -65,7 +65,7 @@
import org.mockito.Mockito;
/**
- * Tests for the {@link AppWindowToken} class.
+ * Tests for the {@link ActivityRecord} class.
*
* Build/Install/Run:
* atest WmTests:AppWindowTokenTests
@@ -77,7 +77,7 @@
TaskStack mStack;
Task mTask;
- ActivityRecord mToken;
+ ActivityRecord mActivity;
private final String mPackageName = getInstrumentation().getTargetContext().getPackageName();
@@ -85,68 +85,68 @@
public void setUp() throws Exception {
mStack = createTaskStackOnDisplay(mDisplayContent);
mTask = createTaskInStack(mStack, 0 /* userId */);
- mToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
+ mActivity = WindowTestUtils.createTestActivityRecord(mDisplayContent);
- mTask.addChild(mToken, 0);
+ mTask.addChild(mActivity, 0);
}
@Test
@Presubmit
public void testAddWindow_Order() {
- assertEquals(0, mToken.getChildCount());
+ assertEquals(0, mActivity.getChildCount());
- final WindowState win1 = createWindow(null, TYPE_APPLICATION, mToken, "win1");
- final WindowState startingWin = createWindow(null, TYPE_APPLICATION_STARTING, mToken,
+ final WindowState win1 = createWindow(null, TYPE_APPLICATION, mActivity, "win1");
+ final WindowState startingWin = createWindow(null, TYPE_APPLICATION_STARTING, mActivity,
"startingWin");
- final WindowState baseWin = createWindow(null, TYPE_BASE_APPLICATION, mToken, "baseWin");
- final WindowState win4 = createWindow(null, TYPE_APPLICATION, mToken, "win4");
+ final WindowState baseWin = createWindow(null, TYPE_BASE_APPLICATION, mActivity, "baseWin");
+ final WindowState win4 = createWindow(null, TYPE_APPLICATION, mActivity, "win4");
// Should not contain the windows that were added above.
- assertEquals(4, mToken.getChildCount());
- assertTrue(mToken.mChildren.contains(win1));
- assertTrue(mToken.mChildren.contains(startingWin));
- assertTrue(mToken.mChildren.contains(baseWin));
- assertTrue(mToken.mChildren.contains(win4));
+ assertEquals(4, mActivity.getChildCount());
+ assertTrue(mActivity.mChildren.contains(win1));
+ assertTrue(mActivity.mChildren.contains(startingWin));
+ assertTrue(mActivity.mChildren.contains(baseWin));
+ assertTrue(mActivity.mChildren.contains(win4));
// The starting window should be on-top of all other windows.
- assertEquals(startingWin, mToken.mChildren.peekLast());
+ assertEquals(startingWin, mActivity.mChildren.peekLast());
// The base application window should be below all other windows.
- assertEquals(baseWin, mToken.mChildren.peekFirst());
- mToken.removeImmediately();
+ assertEquals(baseWin, mActivity.mChildren.peekFirst());
+ mActivity.removeImmediately();
}
@Test
@Presubmit
public void testFindMainWindow() {
- assertNull(mToken.findMainWindow());
+ assertNull(mActivity.findMainWindow());
- final WindowState window1 = createWindow(null, TYPE_BASE_APPLICATION, mToken, "window1");
- final WindowState window11 = createWindow(window1, FIRST_SUB_WINDOW, mToken, "window11");
- final WindowState window12 = createWindow(window1, FIRST_SUB_WINDOW, mToken, "window12");
- assertEquals(window1, mToken.findMainWindow());
+ final WindowState window1 = createWindow(null, TYPE_BASE_APPLICATION, mActivity, "window1");
+ final WindowState window11 = createWindow(window1, FIRST_SUB_WINDOW, mActivity, "window11");
+ final WindowState window12 = createWindow(window1, FIRST_SUB_WINDOW, mActivity, "window12");
+ assertEquals(window1, mActivity.findMainWindow());
window1.mAnimatingExit = true;
- assertEquals(window1, mToken.findMainWindow());
- final WindowState window2 = createWindow(null, TYPE_APPLICATION_STARTING, mToken,
+ assertEquals(window1, mActivity.findMainWindow());
+ final WindowState window2 = createWindow(null, TYPE_APPLICATION_STARTING, mActivity,
"window2");
- assertEquals(window2, mToken.findMainWindow());
- mToken.removeImmediately();
+ assertEquals(window2, mActivity.findMainWindow());
+ mActivity.removeImmediately();
}
@Test
@Presubmit
public void testGetTopFullscreenWindow() {
- assertNull(mToken.getTopFullscreenWindow());
+ assertNull(mActivity.getTopFullscreenWindow());
- final WindowState window1 = createWindow(null, TYPE_BASE_APPLICATION, mToken, "window1");
- final WindowState window11 = createWindow(null, TYPE_APPLICATION, mToken, "window11");
- final WindowState window12 = createWindow(null, TYPE_APPLICATION, mToken, "window12");
- assertEquals(window12, mToken.getTopFullscreenWindow());
+ final WindowState window1 = createWindow(null, TYPE_BASE_APPLICATION, mActivity, "window1");
+ final WindowState window11 = createWindow(null, TYPE_APPLICATION, mActivity, "window11");
+ final WindowState window12 = createWindow(null, TYPE_APPLICATION, mActivity, "window12");
+ assertEquals(window12, mActivity.getTopFullscreenWindow());
window12.mAttrs.width = 500;
- assertEquals(window11, mToken.getTopFullscreenWindow());
+ assertEquals(window11, mActivity.getTopFullscreenWindow());
window11.mAttrs.width = 500;
- assertEquals(window1, mToken.getTopFullscreenWindow());
- mToken.removeImmediately();
+ assertEquals(window1, mActivity.getTopFullscreenWindow());
+ mActivity.removeImmediately();
}
@Test
@@ -155,11 +155,11 @@
final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
TYPE_BASE_APPLICATION);
attrs.setTitle("AppWindow");
- final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mToken);
- mToken.addWindow(appWindow);
+ final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mActivity);
+ mActivity.addWindow(appWindow);
// Set initial orientation and update.
- mToken.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+ mActivity.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
mDisplayContent.updateOrientation(
mDisplayContent.getRequestedOverrideConfiguration(),
null /* freezeThisOneIfNeeded */, false /* forceUpdate */);
@@ -167,7 +167,7 @@
appWindow.mResizeReported = false;
// Update the orientation to perform 180 degree rotation and check that resize was reported.
- mToken.setOrientation(SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
+ mActivity.setOrientation(SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
mDisplayContent.updateOrientation(
mDisplayContent.getRequestedOverrideConfiguration(),
null /* freezeThisOneIfNeeded */, false /* forceUpdate */);
@@ -187,8 +187,8 @@
final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(
TYPE_BASE_APPLICATION);
attrs.setTitle("RotationByPolicy");
- final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mToken);
- mToken.addWindow(appWindow);
+ final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mActivity);
+ mActivity.addWindow(appWindow);
// Set initial orientation and update.
performRotation(displayRotation, Surface.ROTATION_90);
@@ -208,10 +208,10 @@
@Test
public void testSizeCompatBounds() {
- final Rect fixedBounds = mToken.getRequestedOverrideConfiguration().windowConfiguration
+ final Rect fixedBounds = mActivity.getRequestedOverrideConfiguration().windowConfiguration
.getBounds();
fixedBounds.set(0, 0, 1200, 1600);
- mToken.getRequestedOverrideConfiguration().windowConfiguration.setAppBounds(fixedBounds);
+ mActivity.getRequestedOverrideConfiguration().windowConfiguration.setAppBounds(fixedBounds);
final Configuration newParentConfig = mTask.getConfiguration();
// Change the size of the container to two times smaller with insets.
@@ -219,50 +219,50 @@
final Rect containerAppBounds = newParentConfig.windowConfiguration.getAppBounds();
final Rect containerBounds = newParentConfig.windowConfiguration.getBounds();
containerBounds.set(0, 0, 600, 800);
- mToken.onConfigurationChanged(newParentConfig);
+ mActivity.onConfigurationChanged(newParentConfig);
- assertTrue(mToken.hasSizeCompatBounds());
- assertEquals(containerAppBounds, mToken.getBounds());
+ assertTrue(mActivity.hasSizeCompatBounds());
+ assertEquals(containerAppBounds, mActivity.getBounds());
assertEquals((float) containerAppBounds.width() / fixedBounds.width(),
- mToken.getSizeCompatScale(), 0.0001f /* delta */);
+ mActivity.getSizeCompatScale(), 0.0001f /* delta */);
// Change the width of the container to two times bigger.
containerAppBounds.set(0, 0, 2400, 1600);
containerBounds.set(containerAppBounds);
- mToken.onConfigurationChanged(newParentConfig);
+ mActivity.onConfigurationChanged(newParentConfig);
- assertTrue(mToken.hasSizeCompatBounds());
+ assertTrue(mActivity.hasSizeCompatBounds());
// Don't scale up, so the bounds keep the same as the fixed width.
- assertEquals(fixedBounds.width(), mToken.getBounds().width());
+ assertEquals(fixedBounds.width(), mActivity.getBounds().width());
// Assert the position is horizontal center.
assertEquals((containerAppBounds.width() - fixedBounds.width()) / 2,
- mToken.getBounds().left);
- assertEquals(1f, mToken.getSizeCompatScale(), 0.0001f /* delta */);
+ mActivity.getBounds().left);
+ assertEquals(1f, mActivity.getSizeCompatScale(), 0.0001f /* delta */);
// Change the width of the container to fit the fixed bounds.
containerBounds.set(0, 0, 1200, 2000);
- mToken.onConfigurationChanged(newParentConfig);
+ mActivity.onConfigurationChanged(newParentConfig);
// Assert don't use fixed bounds because the region is enough.
- assertFalse(mToken.hasSizeCompatBounds());
+ assertFalse(mActivity.hasSizeCompatBounds());
}
@Test
@Presubmit
public void testGetOrientation() {
- mToken.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+ mActivity.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
- mToken.setOccludesParent(false);
+ mActivity.setOccludesParent(false);
// Can specify orientation if app doesn't occludes parent.
- assertEquals(SCREEN_ORIENTATION_LANDSCAPE, mToken.getOrientation());
+ assertEquals(SCREEN_ORIENTATION_LANDSCAPE, mActivity.getOrientation());
- mToken.setOccludesParent(true);
- mToken.setHidden(true);
- mToken.sendingToBottom = true;
+ mActivity.setOccludesParent(true);
+ mActivity.setHidden(true);
+ mActivity.sendingToBottom = true;
// Can not specify orientation if app isn't visible even though it occludes parent.
- assertEquals(SCREEN_ORIENTATION_UNSET, mToken.getOrientation());
+ assertEquals(SCREEN_ORIENTATION_UNSET, mActivity.getOrientation());
// Can specify orientation if the current orientation candidate is orientation behind.
assertEquals(SCREEN_ORIENTATION_LANDSCAPE,
- mToken.getOrientation(SCREEN_ORIENTATION_BEHIND));
+ mActivity.getOrientation(SCREEN_ORIENTATION_BEHIND));
}
@Test
@@ -272,24 +272,24 @@
TYPE_BASE_APPLICATION);
attrs.flags |= FLAG_SHOW_WHEN_LOCKED | FLAG_DISMISS_KEYGUARD;
attrs.setTitle("AppWindow");
- final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mToken);
+ final WindowTestUtils.TestWindowState appWindow = createWindowState(attrs, mActivity);
// Add window with show when locked flag
- mToken.addWindow(appWindow);
- assertTrue(mToken.containsShowWhenLockedWindow() && mToken.containsDismissKeyguardWindow());
+ mActivity.addWindow(appWindow);
+ assertTrue(mActivity.containsShowWhenLockedWindow() && mActivity.containsDismissKeyguardWindow());
// Start relaunching
- mToken.startRelaunching();
- assertTrue(mToken.containsShowWhenLockedWindow() && mToken.containsDismissKeyguardWindow());
+ mActivity.startRelaunching();
+ assertTrue(mActivity.containsShowWhenLockedWindow() && mActivity.containsDismissKeyguardWindow());
// Remove window and make sure that we still report back flag
- mToken.removeChild(appWindow);
- assertTrue(mToken.containsShowWhenLockedWindow() && mToken.containsDismissKeyguardWindow());
+ mActivity.removeChild(appWindow);
+ assertTrue(mActivity.containsShowWhenLockedWindow() && mActivity.containsDismissKeyguardWindow());
// Finish relaunching and ensure flag is now not reported
- mToken.finishRelaunching();
+ mActivity.finishRelaunching();
assertFalse(
- mToken.containsShowWhenLockedWindow() || mToken.containsDismissKeyguardWindow());
+ mActivity.containsShowWhenLockedWindow() || mActivity.containsDismissKeyguardWindow());
}
@Test
@@ -298,11 +298,11 @@
"closingWindow");
closingWindow.mAnimatingExit = true;
closingWindow.mRemoveOnExit = true;
- closingWindow.mAppToken.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
+ closingWindow.mActivityRecord.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
true /* performLayout */, false /* isVoiceInteraction */);
// We pretended that we were running an exit animation, but that should have been cleared up
- // by changing visibility of AppWindowToken
+ // by changing visibility of ActivityRecord
closingWindow.removeIfPossible();
assertTrue(closingWindow.mRemoved);
}
@@ -310,14 +310,14 @@
@Test
public void testSetOrientation() {
// Assert orientation is unspecified to start.
- assertEquals(SCREEN_ORIENTATION_UNSPECIFIED, mToken.getOrientation());
+ assertEquals(SCREEN_ORIENTATION_UNSPECIFIED, mActivity.getOrientation());
- mToken.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
- assertEquals(SCREEN_ORIENTATION_LANDSCAPE, mToken.getOrientation());
+ mActivity.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+ assertEquals(SCREEN_ORIENTATION_LANDSCAPE, mActivity.getOrientation());
- mDisplayContent.removeAppToken(mToken.token);
+ mDisplayContent.removeAppToken(mActivity.token);
// Assert orientation is unset to after container is removed.
- assertEquals(SCREEN_ORIENTATION_UNSET, mToken.getOrientation());
+ assertEquals(SCREEN_ORIENTATION_UNSET, mActivity.getOrientation());
// Reset display frozen state
mWm.mDisplayFrozen = false;
@@ -325,13 +325,13 @@
@Test
public void testReportOrientationChange() {
- mToken.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+ mActivity.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
mDisplayContent.getDisplayRotation().setFixedToUserRotation(
DisplayRotation.FIXED_TO_USER_ROTATION_ENABLED);
mTask.mTaskRecord = Mockito.mock(TaskRecord.class, RETURNS_DEEP_STUBS);
- mToken.reportDescendantOrientationChangeIfNeeded();
+ mActivity.reportDescendantOrientationChangeIfNeeded();
verify(mTask.mTaskRecord).onConfigurationChanged(any(Configuration.class));
}
@@ -339,14 +339,14 @@
@Test
@FlakyTest(bugId = 131176283)
public void testCreateRemoveStartingWindow() {
- mToken.addStartingWindow(mPackageName,
+ mActivity.addStartingWindow(mPackageName,
android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true,
false, false);
waitUntilHandlersIdle();
- assertHasStartingWindow(mToken);
- mToken.removeStartingWindow();
+ assertHasStartingWindow(mActivity);
+ mActivity.removeStartingWindow();
waitUntilHandlersIdle();
- assertNoStartingWindow(mToken);
+ assertNoStartingWindow(mActivity);
}
@Test
@@ -354,7 +354,7 @@
public void testAddRemoveRace() {
// There was once a race condition between adding and removing starting windows
for (int i = 0; i < 1000; i++) {
- final AppWindowToken appToken = createIsolatedTestAppWindowToken();
+ final ActivityRecord appToken = createIsolatedTestActivityRecord();
appToken.addStartingWindow(mPackageName,
android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true,
@@ -369,76 +369,76 @@
@Test
public void testTransferStartingWindow() {
- final AppWindowToken token1 = createIsolatedTestAppWindowToken();
- final AppWindowToken token2 = createIsolatedTestAppWindowToken();
- token1.addStartingWindow(mPackageName,
+ final ActivityRecord activity1 = createIsolatedTestActivityRecord();
+ final ActivityRecord activity2 = createIsolatedTestActivityRecord();
+ activity1.addStartingWindow(mPackageName,
android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true,
false, false);
waitUntilHandlersIdle();
- token2.addStartingWindow(mPackageName,
- android.R.style.Theme, null, "Test", 0, 0, 0, 0, token1.appToken.asBinder(),
+ activity2.addStartingWindow(mPackageName,
+ android.R.style.Theme, null, "Test", 0, 0, 0, 0, activity1.appToken.asBinder(),
true, true, false, true, false, false);
waitUntilHandlersIdle();
- assertNoStartingWindow(token1);
- assertHasStartingWindow(token2);
+ assertNoStartingWindow(activity1);
+ assertHasStartingWindow(activity2);
}
@Test
public void testTransferStartingWindowWhileCreating() {
- final AppWindowToken token1 = createIsolatedTestAppWindowToken();
- final AppWindowToken token2 = createIsolatedTestAppWindowToken();
- ((TestWindowManagerPolicy) token1.mWmService.mPolicy).setRunnableWhenAddingSplashScreen(
+ final ActivityRecord activity1 = createIsolatedTestActivityRecord();
+ final ActivityRecord activity2 = createIsolatedTestActivityRecord();
+ ((TestWindowManagerPolicy) activity1.mWmService.mPolicy).setRunnableWhenAddingSplashScreen(
() -> {
// Surprise, ...! Transfer window in the middle of the creation flow.
- token2.addStartingWindow(mPackageName,
+ activity2.addStartingWindow(mPackageName,
android.R.style.Theme, null, "Test", 0, 0, 0, 0,
- token1.appToken.asBinder(), true, true, false,
+ activity1.appToken.asBinder(), true, true, false,
true, false, false);
});
- token1.addStartingWindow(mPackageName,
+ activity1.addStartingWindow(mPackageName,
android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true,
false, false);
waitUntilHandlersIdle();
- assertNoStartingWindow(token1);
- assertHasStartingWindow(token2);
+ assertNoStartingWindow(activity1);
+ assertHasStartingWindow(activity2);
}
- private AppWindowToken createIsolatedTestAppWindowToken() {
+ private ActivityRecord createIsolatedTestActivityRecord() {
final TaskStack taskStack = createTaskStackOnDisplay(mDisplayContent);
final Task task = createTaskInStack(taskStack, 0 /* userId */);
- return createTestAppWindowTokenForGivenTask(task);
+ return createTestActivityRecordForGivenTask(task);
}
- private AppWindowToken createTestAppWindowTokenForGivenTask(Task task) {
- final ActivityRecord appToken =
- WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- task.addChild(appToken, 0);
+ private ActivityRecord createTestActivityRecordForGivenTask(Task task) {
+ final ActivityRecord activity =
+ WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ task.addChild(activity, 0);
waitUntilHandlersIdle();
- return appToken;
+ return activity;
}
@Test
public void testTryTransferStartingWindowFromHiddenAboveToken() {
// Add two tasks on top of each other.
- final AppWindowToken tokenTop = createIsolatedTestAppWindowToken();
- final AppWindowToken tokenBottom =
- createTestAppWindowTokenForGivenTask(tokenTop.getTask());
+ final ActivityRecord activityTop = createIsolatedTestActivityRecord();
+ final ActivityRecord activityBottom =
+ createTestActivityRecordForGivenTask(activityTop.getTask());
// Add a starting window.
- tokenTop.addStartingWindow(mPackageName,
+ activityTop.addStartingWindow(mPackageName,
android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true,
false, false);
waitUntilHandlersIdle();
// Make the top one invisible, and try transferring the starting window from the top to the
// bottom one.
- tokenTop.setVisibility(false, false);
- tokenBottom.transferStartingWindowFromHiddenAboveTokenIfNeeded();
+ activityTop.setVisibility(false, false);
+ activityBottom.transferStartingWindowFromHiddenAboveTokenIfNeeded();
waitUntilHandlersIdle();
// Assert that the bottom window now has the starting window.
- assertNoStartingWindow(tokenTop);
- assertHasStartingWindow(tokenBottom);
+ assertNoStartingWindow(activityTop);
+ assertHasStartingWindow(activityBottom);
}
@Test
@@ -450,40 +450,40 @@
// Check that anim bounds for freeform window match task bounds
mTask.setWindowingMode(WINDOWING_MODE_FREEFORM);
- assertEquals(taskBounds, mToken.getAnimationBounds(STACK_CLIP_NONE));
+ assertEquals(taskBounds, mActivity.getAnimationBounds(STACK_CLIP_NONE));
// STACK_CLIP_AFTER_ANIM should use task bounds since they will be clipped by
// bounds animation layer.
mTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
- assertEquals(taskBounds, mToken.getAnimationBounds(STACK_CLIP_AFTER_ANIM));
+ assertEquals(taskBounds, mActivity.getAnimationBounds(STACK_CLIP_AFTER_ANIM));
// STACK_CLIP_BEFORE_ANIM should use stack bounds since it won't be clipped later.
mTask.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
- assertEquals(stackBounds, mToken.getAnimationBounds(STACK_CLIP_BEFORE_ANIM));
+ assertEquals(stackBounds, mActivity.getAnimationBounds(STACK_CLIP_BEFORE_ANIM));
}
@Test
public void testHasStartingWindow() {
final WindowManager.LayoutParams attrs =
new WindowManager.LayoutParams(TYPE_APPLICATION_STARTING);
- final WindowTestUtils.TestWindowState startingWindow = createWindowState(attrs, mToken);
- mToken.startingDisplayed = true;
- mToken.addWindow(startingWindow);
- assertTrue("Starting window should be present", mToken.hasStartingWindow());
- mToken.startingDisplayed = false;
- assertTrue("Starting window should be present", mToken.hasStartingWindow());
+ final WindowTestUtils.TestWindowState startingWindow = createWindowState(attrs, mActivity);
+ mActivity.startingDisplayed = true;
+ mActivity.addWindow(startingWindow);
+ assertTrue("Starting window should be present", mActivity.hasStartingWindow());
+ mActivity.startingDisplayed = false;
+ assertTrue("Starting window should be present", mActivity.hasStartingWindow());
- mToken.removeChild(startingWindow);
- assertFalse("Starting window should not be present", mToken.hasStartingWindow());
+ mActivity.removeChild(startingWindow);
+ assertFalse("Starting window should not be present", mActivity.hasStartingWindow());
}
- private void assertHasStartingWindow(AppWindowToken atoken) {
+ private void assertHasStartingWindow(ActivityRecord atoken) {
assertNotNull(atoken.startingSurface);
assertNotNull(atoken.mStartingData);
assertNotNull(atoken.startingWindow);
}
- private void assertNoStartingWindow(AppWindowToken atoken) {
+ private void assertNoStartingWindow(ActivityRecord atoken) {
assertNull(atoken.startingSurface);
assertNull(atoken.startingWindow);
assertNull(atoken.mStartingData);
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
index f12c349..01489c6 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
@@ -113,13 +113,13 @@
public void testForAllWindows() {
final WindowState exitingAppWindow = createWindow(null, TYPE_BASE_APPLICATION,
mDisplayContent, "exiting app");
- final AppWindowToken exitingAppToken = exitingAppWindow.mAppToken;
+ final ActivityRecord exitingApp = exitingAppWindow.mActivityRecord;
// Wait until everything in animation handler get executed to prevent the exiting window
// from being removed during WindowSurfacePlacer Traversal.
waitUntilHandlersIdle();
- exitingAppToken.mIsExiting = true;
- exitingAppToken.getTask().mStack.mExitingAppTokens.add(exitingAppToken);
+ exitingApp.mIsExiting = true;
+ exitingApp.getTask().mStack.mExitingActivities.add(exitingApp);
assertForAllWindowsOrder(Arrays.asList(
mWallpaperWindow,
@@ -241,10 +241,10 @@
assertEquals(dc, stack.getDisplayContent());
final Task task = createTaskInStack(stack, 0 /* userId */);
- final ActivityRecord token = WindowTestUtils.createTestAppWindowToken(dc);
- task.addChild(token, 0);
+ final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(dc);
+ task.addChild(activity, 0);
assertEquals(dc, task.getDisplayContent());
- assertEquals(dc, token.getDisplayContent());
+ assertEquals(dc, activity.getDisplayContent());
// Move stack to first display.
mDisplayContent.moveStackToDisplay(stack, true /* onTop */);
@@ -252,7 +252,7 @@
assertEquals(mDisplayContent, stack.getParent().getParent());
assertEquals(mDisplayContent, stack.getDisplayContent());
assertEquals(mDisplayContent, task.getDisplayContent());
- assertEquals(mDisplayContent, token.getDisplayContent());
+ assertEquals(mDisplayContent, activity.getDisplayContent());
}
/**
@@ -313,17 +313,17 @@
// Add stack with activity.
final TaskStack stack0 = createTaskStackOnDisplay(dc0);
final Task task0 = createTaskInStack(stack0, 0 /* userId */);
- final ActivityRecord token =
- WindowTestUtils.createTestAppWindowToken(dc0);
- task0.addChild(token, 0);
+ final ActivityRecord activity =
+ WindowTestUtils.createTestActivityRecord(dc0);
+ task0.addChild(activity, 0);
dc0.configureDisplayPolicy();
assertNotNull(dc0.mTapDetector);
final TaskStack stack1 = createTaskStackOnDisplay(dc1);
final Task task1 = createTaskInStack(stack1, 0 /* userId */);
- final ActivityRecord token1 =
- WindowTestUtils.createTestAppWindowToken(dc0);
- task1.addChild(token1, 0);
+ final ActivityRecord activity1 =
+ WindowTestUtils.createTestActivityRecord(dc0);
+ task1.addChild(activity1, 0);
dc1.configureDisplayPolicy();
assertNotNull(dc1.mTapDetector);
@@ -362,7 +362,7 @@
// Create a focusable window and check that focus is calculated correctly
final WindowState window1 =
createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "window1");
- window1.mAppToken.mTargetSdk = targetSdk;
+ window1.mActivityRecord.mTargetSdk = targetSdk;
updateFocusedWindow();
assertTrue(window1.isFocused());
assertEquals(window1, mWm.mRoot.getTopFocusedDisplayContent().mCurrentFocus);
@@ -375,7 +375,7 @@
// Add a window to the second display, and it should be focused
final WindowState window2 = createWindow(null, TYPE_BASE_APPLICATION, dc, "window2");
- window2.mAppToken.mTargetSdk = targetSdk;
+ window2.mActivityRecord.mTargetSdk = targetSdk;
updateFocusedWindow();
assertTrue(window2.isFocused());
assertEquals(perDisplayFocusEnabled && targetSdk >= Q, window1.isFocused());
@@ -389,8 +389,8 @@
assertEquals(window1, mWm.mRoot.getTopFocusedDisplayContent().mCurrentFocus);
// Make sure top focused display not changed if there is a focused app.
- window1.mAppToken.hiddenRequested = true;
- window1.getDisplayContent().setFocusedApp(window1.mAppToken);
+ window1.mActivityRecord.hiddenRequested = true;
+ window1.getDisplayContent().setFocusedApp(window1.mActivityRecord);
updateFocusedWindow();
assertTrue(!window1.isFocused());
assertEquals(window1.getDisplayId(),
@@ -569,7 +569,7 @@
// Create a window that requests landscape orientation. It will define device orientation
// by default.
final WindowState window = createWindow(null /* parent */, TYPE_BASE_APPLICATION, dc, "w");
- window.mAppToken.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+ window.mActivityRecord.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
final WindowState keyguard = createWindow(null, TYPE_STATUS_BAR, dc, "keyguard");
keyguard.mHasSurface = true;
@@ -747,7 +747,7 @@
new InsetsModeSession(ViewRootImpl.NEW_INSETS_MODE_IME)) {
final DisplayContent dc = createNewDisplay();
dc.mInputMethodTarget = createWindow(null, TYPE_BASE_APPLICATION, "app");
- assertEquals(dc.mInputMethodTarget.mAppToken.getSurfaceControl(),
+ assertEquals(dc.mInputMethodTarget.mActivityRecord.getSurfaceControl(),
dc.computeImeParent());
}
}
@@ -766,8 +766,8 @@
@Test
public void testComputeImeParent_app_notMatchParentBounds() {
- spyOn(mAppWindow.mAppToken);
- doReturn(false).when(mAppWindow.mAppToken).matchParentBounds();
+ spyOn(mAppWindow.mActivityRecord);
+ doReturn(false).when(mAppWindow.mActivityRecord).matchParentBounds();
mDisplayContent.mInputMethodTarget = mAppWindow;
// The surface parent of IME should be the display instead of app window.
assertEquals(mDisplayContent.getWindowingLayer(), mDisplayContent.computeImeParent());
@@ -881,7 +881,7 @@
win.getAttrs().subtreeSystemUiVisibility = win.mSystemUiVisibility =
SYSTEM_UI_FLAG_FULLSCREEN | SYSTEM_UI_FLAG_HIDE_NAVIGATION
| SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
- win.mAppToken.mTargetSdk = P;
+ win.mActivityRecord.mTargetSdk = P;
dc.setLayoutNeeded();
dc.performLayout(true /* initial */, false /* updateImeWindows */);
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
index 480c468..bb4d35f 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
@@ -638,7 +638,7 @@
mBuilder.build();
final WindowState win = mock(WindowState.class);
- win.mAppToken = mock(AppWindowToken.class);
+ win.mActivityRecord = mock(ActivityRecord.class);
final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams();
attrs.rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS;
@@ -648,13 +648,13 @@
mMockDisplayContent.mCurrentFocus = win;
mTarget.mUpsideDownRotation = Surface.ROTATION_180;
- doReturn(true).when(win.mAppToken).matchParentBounds();
+ doReturn(true).when(win.mActivityRecord).matchParentBounds();
// The focused fullscreen opaque window without override bounds should be able to be
// rotated seamlessly.
assertTrue(mTarget.shouldRotateSeamlessly(
Surface.ROTATION_0, Surface.ROTATION_90, false /* forceUpdate */));
- doReturn(false).when(win.mAppToken).matchParentBounds();
+ doReturn(false).when(win.mActivityRecord).matchParentBounds();
// No seamless rotation if the window may be positioned with offset after rotation.
assertFalse(mTarget.shouldRotateSeamlessly(
Surface.ROTATION_0, Surface.ROTATION_90, false /* forceUpdate */));
diff --git a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java
index 452e06f..bfb4607 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java
@@ -96,15 +96,15 @@
* Creates a window state which can be used as a drop target.
*/
private WindowState createDropTargetWindow(String name, int ownerId) {
- final ActivityRecord token = WindowTestUtils.createTestAppWindowToken(
+ final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(
mDisplayContent);
final TaskStack stack = createTaskStackOnDisplay(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent);
final Task task = createTaskInStack(stack, ownerId);
- task.addChild(token, 0);
+ task.addChild(activity, 0);
final WindowState window = createWindow(
- null, TYPE_BASE_APPLICATION, token, name, ownerId, false);
+ null, TYPE_BASE_APPLICATION, activity, name, ownerId, false);
window.mInputChannel = new InputChannel();
window.mHasSurface = true;
return window;
diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java
index f353846..fff77f5 100644
--- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java
@@ -99,14 +99,14 @@
@Test
public void testRemovedBeforeStarted_expectCanceled() throws Exception {
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- AnimationAdapter adapter = mController.addAnimation(appWindow.getTask(),
+ AnimationAdapter adapter = mController.addAnimation(activity.getTask(),
false /* isRecentTaskInvisible */);
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
// Remove the app window so that the animation target can not be created
- appWindow.removeImmediately();
+ activity.removeImmediately();
mController.startAnimation();
// Verify that the finish callback to reparent the leash is called
@@ -118,14 +118,14 @@
@Test
public void testCancelAfterRemove_expectIgnored() {
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- AnimationAdapter adapter = mController.addAnimation(appWindow.getTask(),
+ AnimationAdapter adapter = mController.addAnimation(activity.getTask(),
false /* isRecentTaskInvisible */);
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
// Remove the app window so that the animation target can not be created
- appWindow.removeImmediately();
+ activity.removeImmediately();
mController.startAnimation();
mController.cleanupAnimation(REORDER_KEEP_IN_PLACE);
try {
@@ -140,24 +140,24 @@
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
- final AppWindowToken homeAppWindow =
+ final ActivityRecord homeActivity =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)
.setStack(homeStack)
.setCreateTask(true)
.build();
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final AppWindowToken hiddenAppWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord hiddenActivity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- hiddenAppWindow.setHidden(true);
+ hiddenActivity.setHidden(true);
mDisplayContent.getConfiguration().windowConfiguration.setRotation(
mDisplayContent.getRotation());
mController.initialize(ACTIVITY_TYPE_HOME, new SparseBooleanArray());
// Ensure that we are animating the target activity as well
- assertTrue(mController.isAnimatingTask(homeAppWindow.getTask()));
- assertTrue(mController.isAnimatingTask(appWindow.getTask()));
- assertFalse(mController.isAnimatingTask(hiddenAppWindow.getTask()));
+ assertTrue(mController.isAnimatingTask(homeActivity.getTask()));
+ assertTrue(mController.isAnimatingTask(activity.getTask()));
+ assertFalse(mController.isAnimatingTask(hiddenActivity.getTask()));
}
@Test
@@ -165,12 +165,12 @@
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
- final AppWindowToken homeAppWindow =
+ final ActivityRecord homeAppWindow =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)
.setStack(homeStack)
.setCreateTask(true)
.build();
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord appWindow = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1");
appWindow.addWindow(win1);
@@ -194,15 +194,15 @@
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
- final AppWindowToken homeAppWindow =
+ final ActivityRecord homeActivity =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)
.setStack(homeStack)
.setCreateTask(true)
.build();
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1");
- appWindow.addWindow(win1);
+ final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1");
+ activity.addWindow(win1);
final WallpaperWindowToken wallpaperWindowToken = new WallpaperWindowToken(mWm,
mock(IBinder.class), true, mDisplayContent, true /* ownerCanManageAppTokens */);
spyOn(mDisplayContent.mWallpaperController);
@@ -215,7 +215,7 @@
// Cancel the animation and ensure the controller is still running
wallpaperWindowToken.cancelAnimation();
- assertTrue(mController.isAnimatingTask(appWindow.getTask()));
+ assertTrue(mController.isAnimatingTask(activity.getTask()));
assertFalse(mController.isAnimatingWallpaper(wallpaperWindowToken));
verify(mMockRunner, never()).onAnimationCanceled(null /* taskSnapshot */);
}
@@ -225,17 +225,17 @@
mWm.setRecentsAnimationController(mController);
final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
- final AppWindowToken homeAppWindow =
+ final ActivityRecord homeActivity =
new ActivityTestsBase.ActivityBuilder(mWm.mAtmService)
.setStack(homeStack)
.setCreateTask(true)
.build();
- final WindowState hwin1 = createWindow(null, TYPE_BASE_APPLICATION, homeAppWindow, "hwin1");
- homeAppWindow.addWindow(hwin1);
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final WindowState hwin1 = createWindow(null, TYPE_BASE_APPLICATION, homeActivity, "hwin1");
+ homeActivity.addWindow(hwin1);
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1");
- appWindow.addWindow(win1);
+ final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1");
+ activity.addWindow(win1);
final WallpaperWindowToken wallpaperWindowToken = new WallpaperWindowToken(mWm,
mock(IBinder.class), true, mDisplayContent, true /* ownerCanManageAppTokens */);
spyOn(mDisplayContent.mWallpaperController);
@@ -256,15 +256,15 @@
@Test
public void testDeferCancelAnimation() throws Exception {
mWm.setRecentsAnimationController(mController);
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1");
- appWindow.addWindow(win1);
- assertEquals(appWindow.getTask().getTopVisibleAppToken(), appWindow);
- assertEquals(appWindow.findMainWindow(), win1);
+ final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1");
+ activity.addWindow(win1);
+ assertEquals(activity.getTask().getTopVisibleActivity(), activity);
+ assertEquals(activity.findMainWindow(), win1);
- mController.addAnimation(appWindow.getTask(), false /* isRecentTaskInvisible */);
- assertTrue(mController.isAnimatingTask(appWindow.getTask()));
+ mController.addAnimation(activity.getTask(), false /* isRecentTaskInvisible */);
+ assertTrue(mController.isAnimatingTask(activity.getTask()));
mController.setDeferredCancel(true /* deferred */, false /* screenshot */);
mController.cancelAnimationWithScreenshot(false /* screenshot */);
@@ -279,15 +279,15 @@
@Test
public void testDeferCancelAnimationWithScreenShot() throws Exception {
mWm.setRecentsAnimationController(mController);
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1");
- appWindow.addWindow(win1);
- assertEquals(appWindow.getTask().getTopVisibleAppToken(), appWindow);
- assertEquals(appWindow.findMainWindow(), win1);
+ final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1");
+ activity.addWindow(win1);
+ assertEquals(activity.getTask().getTopVisibleActivity(), activity);
+ assertEquals(activity.findMainWindow(), win1);
- mController.addAnimation(appWindow.getTask(), false /* isRecentTaskInvisible */);
- assertTrue(mController.isAnimatingTask(appWindow.getTask()));
+ mController.addAnimation(activity.getTask(), false /* isRecentTaskInvisible */);
+ assertTrue(mController.isAnimatingTask(activity.getTask()));
spyOn(mWm.mTaskSnapshotController);
doNothing().when(mWm.mTaskSnapshotController).notifyAppVisibilityChanged(any(),
@@ -311,20 +311,20 @@
@Test
public void testShouldAnimateWhenNoCancelWithDeferredScreenshot() {
mWm.setRecentsAnimationController(mController);
- final AppWindowToken appWindow = createAppWindowToken(mDisplayContent,
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1");
- appWindow.addWindow(win1);
- assertEquals(appWindow.getTask().getTopVisibleAppToken(), appWindow);
- assertEquals(appWindow.findMainWindow(), win1);
+ final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity, "win1");
+ activity.addWindow(win1);
+ assertEquals(activity.getTask().getTopVisibleActivity(), activity);
+ assertEquals(activity.findMainWindow(), win1);
- mController.addAnimation(appWindow.getTask(), false /* isRecentTaskInvisible */);
- assertTrue(mController.isAnimatingTask(appWindow.getTask()));
+ mController.addAnimation(activity.getTask(), false /* isRecentTaskInvisible */);
+ assertTrue(mController.isAnimatingTask(activity.getTask()));
- // Assume appWindow transition should animate when no
+ // Assume activity transition should animate when no
// IRecentsAnimationController#setCancelWithDeferredScreenshot called.
assertFalse(mController.shouldDeferCancelWithScreenshot());
- assertTrue(appWindow.shouldAnimate(TRANSIT_ACTIVITY_CLOSE));
+ assertTrue(activity.shouldAnimate(TRANSIT_ACTIVITY_CLOSE));
}
private static void verifyNoMoreInteractionsExceptAsBinder(IInterface binder) {
diff --git a/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java
index efc2fd6..a23425f 100644
--- a/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java
@@ -106,7 +106,7 @@
"overrideWindow");
overrideWindow.mAttrs.packageName = "com.android.test";
overrideWindow.mAttrs.preferredDisplayModeId = LOW_MODE_ID;
- overrideWindow.mAppToken.mSurfaceAnimator.startAnimation(
+ overrideWindow.mActivityRecord.mSurfaceAnimator.startAnimation(
overrideWindow.getPendingTransaction(), mock(AnimationAdapter.class),
false /* hidden */);
mPolicy.addNonHighRefreshRatePackage("com.android.test");
@@ -122,7 +122,7 @@
mPolicy.addNonHighRefreshRatePackage("com.android.test");
assertEquals(LOW_MODE_ID, mPolicy.getPreferredModeId(cameraUsingWindow));
- cameraUsingWindow.mAppToken.mSurfaceAnimator.startAnimation(
+ cameraUsingWindow.mActivityRecord.mSurfaceAnimator.startAnimation(
cameraUsingWindow.getPendingTransaction(), mock(AnimationAdapter.class),
false /* hidden */);
assertEquals(0, mPolicy.getPreferredModeId(cameraUsingWindow));
diff --git a/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java
index 3b9c3bb..e353903 100644
--- a/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/RemoteAnimationControllerTest.java
@@ -91,9 +91,9 @@
@Test
public void testRun() throws Exception {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- mDisplayContent.mOpeningApps.add(win.mAppToken);
+ mDisplayContent.mOpeningApps.add(win.mActivityRecord);
try {
- final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,
+ final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
mController.goodToGo();
@@ -110,8 +110,8 @@
final RemoteAnimationTarget app = appsCaptor.getValue()[0];
assertEquals(new Point(50, 100), app.position);
assertEquals(new Rect(50, 100, 150, 150), app.sourceContainerBounds);
- assertEquals(win.mAppToken.getPrefixOrderIndex(), app.prefixOrderIndex);
- assertEquals(win.mAppToken.getTask().mTaskId, app.taskId);
+ assertEquals(win.mActivityRecord.getPrefixOrderIndex(), app.prefixOrderIndex);
+ assertEquals(win.mActivityRecord.getTask().mTaskId, app.taskId);
assertEquals(mMockLeash, app.leash);
assertEquals(win.mWinAnimator.mLastClipRect, app.clipRect);
assertEquals(false, app.isTranslucent);
@@ -129,7 +129,7 @@
@Test
public void testCancel() throws Exception {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,
+ final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
mController.goodToGo();
@@ -142,7 +142,7 @@
@FlakyTest(bugId = 133372977)
public void testTimeout() throws Exception {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,
+ final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
mController.goodToGo();
@@ -161,7 +161,7 @@
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION,
"testWin");
final AnimationAdapter adapter = mController.createRemoteAnimationRecord(
- win.mAppToken, new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
+ win.mActivityRecord, new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
mController.goodToGo();
@@ -189,7 +189,7 @@
@Test
public void testNotReallyStarted() {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- mController.createRemoteAnimationRecord(win.mAppToken,
+ mController.createRemoteAnimationRecord(win.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null);
mController.goodToGo();
verifyNoMoreInteractionsExceptAsBinder(mMockRunner);
@@ -199,9 +199,9 @@
public void testOneNotStarted() throws Exception {
final WindowState win1 = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin1");
final WindowState win2 = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin2");
- mController.createRemoteAnimationRecord(win1.mAppToken,
+ mController.createRemoteAnimationRecord(win1.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null);
- final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win2.mAppToken,
+ final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win2.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
mController.goodToGo();
@@ -221,10 +221,10 @@
@Test
public void testRemovedBeforeStarted() {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,
+ final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
- win.mAppToken.removeImmediately();
+ win.mActivityRecord.removeImmediately();
mController.goodToGo();
verifyNoMoreInteractionsExceptAsBinder(mMockRunner);
verify(mFinishedCallback).onAnimationFinished(eq(adapter));
@@ -233,10 +233,10 @@
@Test
public void testChange() throws Exception {
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- mDisplayContent.mChangingApps.add(win.mAppToken);
+ mDisplayContent.mChangingApps.add(win.mActivityRecord);
try {
final RemoteAnimationRecord record = mController.createRemoteAnimationRecord(
- win.mAppToken, new Point(50, 100), new Rect(50, 100, 150, 150),
+ win.mActivityRecord, new Point(50, 100), new Rect(50, 100, 150, 150),
new Rect(0, 0, 200, 200));
assertNotNull(record.mThumbnailAdapter);
((AnimationAdapter) record.mAdapter)
@@ -284,9 +284,9 @@
spyOn(mDisplayContent.mWallpaperController);
doReturn(true).when(mDisplayContent.mWallpaperController).isWallpaperVisible();
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- mDisplayContent.mOpeningApps.add(win.mAppToken);
+ mDisplayContent.mOpeningApps.add(win.mActivityRecord);
try {
- final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,
+ final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
mController.goodToGo();
@@ -312,9 +312,9 @@
spyOn(mDisplayContent.mWallpaperController);
doReturn(true).when(mDisplayContent.mWallpaperController).isWallpaperVisible();
final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");
- mDisplayContent.mOpeningApps.add(win.mAppToken);
+ mDisplayContent.mOpeningApps.add(win.mActivityRecord);
try {
- final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mAppToken,
+ final AnimationAdapter adapter = mController.createRemoteAnimationRecord(win.mActivityRecord,
new Point(50, 100), new Rect(50, 100, 150, 150), null).mAdapter;
adapter.startAnimation(mMockLeash, mMockTransaction, mFinishedCallback);
mController.goodToGo();
diff --git a/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimatorTest.java b/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimatorTest.java
index 2b1c4ff..979aab6 100644
--- a/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimatorTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/SurfaceAnimatorTest.java
@@ -237,7 +237,7 @@
mDeferFinishAnimatable.mFinishedCallbackCalled = false;
// Simulate the first deferred callback is executed from
- // {@link AnimatingAppWindowTokenRegistry#endDeferringFinished}.
+ // {@link AnimatingActivityRegistry#endDeferringFinished}.
firstDeferFinishCallback.run();
// The second animation should not be finished.
assertFalse(mDeferFinishAnimatable.mFinishedCallbackCalled);
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotCacheTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotCacheTest.java
index 3bedabc..bebb3ba 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotCacheTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotCacheTest.java
@@ -54,7 +54,7 @@
mCache.putSnapshot(window.getTask(), createSnapshot());
assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, 0 /* userId */,
false /* restoreFromDisk */, false /* reducedResolution */));
- mCache.onAppRemoved(window.mAppToken);
+ mCache.onAppRemoved(window.mActivityRecord);
assertNull(mCache.getSnapshot(window.getTask().mTaskId, 0 /* userId */,
false /* restoreFromDisk */, false /* reducedResolution */));
}
@@ -65,7 +65,7 @@
mCache.putSnapshot(window.getTask(), createSnapshot());
assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, 0 /* userId */,
false /* restoreFromDisk */, false /* reducedResolution */));
- mCache.onAppDied(window.mAppToken);
+ mCache.onAppDied(window.mActivityRecord);
assertNull(mCache.getSnapshot(window.getTask().mTaskId, 0 /* userId */,
false /* restoreFromDisk */, false /* reducedResolution */));
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotControllerTest.java
index 113f3c8..3b11003 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotControllerTest.java
@@ -48,14 +48,14 @@
public void testGetClosingApps_closing() {
final WindowState closingWindow = createWindow(null, FIRST_APPLICATION_WINDOW,
"closingWindow");
- closingWindow.mAppToken.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
+ closingWindow.mActivityRecord.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
true /* performLayout */, false /* isVoiceInteraction */);
- final ArraySet<AppWindowToken> closingApps = new ArraySet<>();
- closingApps.add(closingWindow.mAppToken);
+ final ArraySet<ActivityRecord> closingApps = new ArraySet<>();
+ closingApps.add(closingWindow.mActivityRecord);
final ArraySet<Task> closingTasks = new ArraySet<>();
mWm.mTaskSnapshotController.getClosingTasks(closingApps, closingTasks);
assertEquals(1, closingTasks.size());
- assertEquals(closingWindow.mAppToken.getTask(), closingTasks.valueAt(0));
+ assertEquals(closingWindow.mActivityRecord.getTask(), closingTasks.valueAt(0));
}
@Test
@@ -64,12 +64,12 @@
"closingWindow");
final WindowState openingWindow = createAppWindow(closingWindow.getTask(),
FIRST_APPLICATION_WINDOW, "openingWindow");
- closingWindow.mAppToken.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
+ closingWindow.mActivityRecord.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
true /* performLayout */, false /* isVoiceInteraction */);
- openingWindow.mAppToken.commitVisibility(null, true /* visible */, TRANSIT_UNSET,
+ openingWindow.mActivityRecord.commitVisibility(null, true /* visible */, TRANSIT_UNSET,
true /* performLayout */, false /* isVoiceInteraction */);
- final ArraySet<AppWindowToken> closingApps = new ArraySet<>();
- closingApps.add(closingWindow.mAppToken);
+ final ArraySet<ActivityRecord> closingApps = new ArraySet<>();
+ closingApps.add(closingWindow.mActivityRecord);
final ArraySet<Task> closingTasks = new ArraySet<>();
mWm.mTaskSnapshotController.getClosingTasks(closingApps, closingTasks);
assertEquals(0, closingTasks.size());
@@ -79,13 +79,13 @@
public void testGetClosingApps_skipClosingAppsSnapshotTasks() {
final WindowState closingWindow = createWindow(null, FIRST_APPLICATION_WINDOW,
"closingWindow");
- closingWindow.mAppToken.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
+ closingWindow.mActivityRecord.commitVisibility(null, false /* visible */, TRANSIT_UNSET,
true /* performLayout */, false /* isVoiceInteraction */);
- final ArraySet<AppWindowToken> closingApps = new ArraySet<>();
- closingApps.add(closingWindow.mAppToken);
+ final ArraySet<ActivityRecord> closingApps = new ArraySet<>();
+ closingApps.add(closingWindow.mActivityRecord);
final ArraySet<Task> closingTasks = new ArraySet<>();
mWm.mTaskSnapshotController.addSkipClosingAppSnapshotTasks(
- Sets.newArraySet(closingWindow.mAppToken.getTask()));
+ Sets.newArraySet(closingWindow.mActivityRecord.getTask()));
mWm.mTaskSnapshotController.getClosingTasks(closingApps, closingTasks);
assertEquals(0, closingTasks.size());
}
@@ -94,7 +94,7 @@
public void testGetSnapshotMode() {
final WindowState disabledWindow = createWindow(null,
FIRST_APPLICATION_WINDOW, mDisplayContent, "disabledWindow");
- disabledWindow.mAppToken.setDisablePreviewScreenshots(true);
+ disabledWindow.mActivityRecord.setDisablePreviewScreenshots(true);
assertEquals(SNAPSHOT_MODE_APP_THEME,
mWm.mTaskSnapshotController.getSnapshotMode(disabledWindow.getTask()));
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java
index eef680b..a66c79c 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java
@@ -55,7 +55,7 @@
final Task pinnedTask = createTaskInStack(mPinnedStack, 0 /* userId */);
assertFalse(mPinnedStack.isVisible());
final ActivityRecord pinnedApp =
- WindowTestUtils.createTestAppWindowToken(mDisplayContent);
+ WindowTestUtils.createTestActivityRecord(mDisplayContent);
pinnedTask.addChild(pinnedApp, 0 /* addPos */);
assertTrue(mPinnedStack.isVisible());
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
index d045073..5b9a785 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
@@ -68,19 +68,19 @@
public void testClosingAppDifferentStackOrientation() {
final TaskStack stack = createTaskStackOnDisplay(mDisplayContent);
final Task task1 = createTaskInStack(stack, 0 /* userId */);
- ActivityRecord appWindowToken1 =
- WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- task1.addChild(appWindowToken1, 0);
- appWindowToken1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+ ActivityRecord activity1 =
+ WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ task1.addChild(activity1, 0);
+ activity1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
final Task task2 = createTaskInStack(stack, 1 /* userId */);
- ActivityRecord appWindowToken2 =
- WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- task2.addChild(appWindowToken2, 0);
- appWindowToken2.setOrientation(SCREEN_ORIENTATION_PORTRAIT);
+ ActivityRecord activity2=
+ WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ task2.addChild(activity2, 0);
+ activity2.setOrientation(SCREEN_ORIENTATION_PORTRAIT);
assertEquals(SCREEN_ORIENTATION_PORTRAIT, stack.getOrientation());
- mDisplayContent.mClosingApps.add(appWindowToken2);
+ mDisplayContent.mClosingApps.add(activity2);
assertEquals(SCREEN_ORIENTATION_LANDSCAPE, stack.getOrientation());
}
@@ -88,16 +88,16 @@
public void testMoveTaskToBackDifferentStackOrientation() {
final TaskStack stack = createTaskStackOnDisplay(mDisplayContent);
final Task task1 = createTaskInStack(stack, 0 /* userId */);
- ActivityRecord appWindowToken1 =
- WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- task1.addChild(appWindowToken1, 0);
- appWindowToken1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+ ActivityRecord activity1 =
+ WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ task1.addChild(activity1, 0);
+ activity1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);
final Task task2 = createTaskInStack(stack, 1 /* userId */);
- ActivityRecord appWindowToken2 =
- WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- task2.addChild(appWindowToken2, 0);
- appWindowToken2.setOrientation(SCREEN_ORIENTATION_PORTRAIT);
+ ActivityRecord activity2 =
+ WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ task2.addChild(activity2, 0);
+ activity2.setOrientation(SCREEN_ORIENTATION_PORTRAIT);
assertEquals(SCREEN_ORIENTATION_PORTRAIT, stack.getOrientation());
task2.setSendingToBottom(true);
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
index f117ff0..2ba1834 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
@@ -46,22 +46,22 @@
public void testRemoveContainer() {
final TaskStack stackController1 = createTaskStackOnDisplay(mDisplayContent);
final WindowTestUtils.TestTask task = WindowTestUtils.createTestTask(stackController1);
- final AppWindowToken appToken =
- WindowTestUtils.createAppWindowTokenInTask(mDisplayContent, task);
+ final ActivityRecord activity =
+ WindowTestUtils.createActivityRecordInTask(mDisplayContent, task);
task.removeIfPossible();
// Assert that the container was removed.
assertNull(task.getParent());
assertEquals(0, task.getChildCount());
- assertNull(appToken.getParent());
+ assertNull(activity.getParent());
}
@Test
public void testRemoveContainer_deferRemoval() {
final TaskStack stackController1 = createTaskStackOnDisplay(mDisplayContent);
final WindowTestUtils.TestTask task = WindowTestUtils.createTestTask(stackController1);
- final AppWindowToken appToken =
- WindowTestUtils.createAppWindowTokenInTask(mDisplayContent, task);
+ final ActivityRecord activity =
+ WindowTestUtils.createActivityRecordInTask(mDisplayContent, task);
task.mShouldDeferRemoval = true;
@@ -70,12 +70,12 @@
// until the task window container is removed.
assertNotNull(task.getParent());
assertNotEquals(0, task.getChildCount());
- assertNotNull(appToken.getParent());
+ assertNotNull(activity.getParent());
task.removeImmediately();
assertNull(task.getParent());
assertEquals(0, task.getChildCount());
- assertNull(appToken.getParent());
+ assertNull(activity.getParent());
}
@Test
diff --git a/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java
index 761f73e..aa6c14e 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java
@@ -117,16 +117,16 @@
CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes, int icon,
int logo, int windowFlags, Configuration overrideConfig, int displayId) {
final com.android.server.wm.WindowState window;
- final AppWindowToken atoken;
+ final ActivityRecord activity;
final WindowManagerService wm = mWmSupplier.get();
synchronized (wm.mGlobalLock) {
- atoken = wm.mRoot.getAppWindowToken(appToken);
+ activity = wm.mRoot.getActivityRecord(appToken);
IWindow iWindow = mock(IWindow.class);
doReturn(mock(IBinder.class)).when(iWindow).asBinder();
- window = WindowTestsBase.createWindow(null, TYPE_APPLICATION_STARTING, atoken,
+ window = WindowTestsBase.createWindow(null, TYPE_APPLICATION_STARTING, activity,
"Starting window", 0 /* ownerId */, false /* internalWindows */, wm,
mock(Session.class), iWindow, mPowerManagerWrapper);
- atoken.startingWindow = window;
+ activity.startingWindow = window;
}
if (mRunnableWhenAddingSplashScreen != null) {
mRunnableWhenAddingSplashScreen.run();
@@ -134,8 +134,8 @@
}
return () -> {
synchronized (wm.mGlobalLock) {
- atoken.removeChild(window);
- atoken.startingWindow = null;
+ activity.removeChild(window);
+ activity.startingWindow = null;
}
};
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java
index 2e86178..e8a4e90 100644
--- a/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java
@@ -44,10 +44,10 @@
@Test
public void testFlow() {
- final AppWindowToken token = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(token);
- mDisplayContent.mUnknownAppVisibilityController.notifyAppResumedFinished(token);
- mDisplayContent.mUnknownAppVisibilityController.notifyRelayouted(token);
+ final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity);
+ mDisplayContent.mUnknownAppVisibilityController.notifyAppResumedFinished(activity);
+ mDisplayContent.mUnknownAppVisibilityController.notifyRelayouted(activity);
// Make sure our handler processed the message.
waitHandlerIdle(mWm.mH);
@@ -56,14 +56,14 @@
@Test
public void testMultiple() {
- final AppWindowToken token1 = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- final AppWindowToken token2 = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(token1);
- mDisplayContent.mUnknownAppVisibilityController.notifyAppResumedFinished(token1);
- mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(token2);
- mDisplayContent.mUnknownAppVisibilityController.notifyRelayouted(token1);
- mDisplayContent.mUnknownAppVisibilityController.notifyAppResumedFinished(token2);
- mDisplayContent.mUnknownAppVisibilityController.notifyRelayouted(token2);
+ final ActivityRecord activity1 = WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ final ActivityRecord activity2 = WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity1);
+ mDisplayContent.mUnknownAppVisibilityController.notifyAppResumedFinished(activity1);
+ mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity2);
+ mDisplayContent.mUnknownAppVisibilityController.notifyRelayouted(activity1);
+ mDisplayContent.mUnknownAppVisibilityController.notifyAppResumedFinished(activity2);
+ mDisplayContent.mUnknownAppVisibilityController.notifyRelayouted(activity2);
// Make sure our handler processed the message.
waitHandlerIdle(mWm.mH);
@@ -72,17 +72,17 @@
@Test
public void testClear() {
- final AppWindowToken token = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(token);
+ final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity);
mDisplayContent.mUnknownAppVisibilityController.clear();
assertTrue(mDisplayContent.mUnknownAppVisibilityController.allResolved());
}
@Test
public void testAppRemoved() {
- final AppWindowToken token = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(token);
- mDisplayContent.mUnknownAppVisibilityController.appRemovedOrHidden(token);
+ final ActivityRecord activity = WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity);
+ mDisplayContent.mUnknownAppVisibilityController.appRemovedOrHidden(activity);
assertTrue(mDisplayContent.mUnknownAppVisibilityController.allResolved());
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java
index 3563feb..5c547c2 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java
@@ -422,10 +422,10 @@
// Now simulate switch to fullscreen for letterboxed app.
final int xInset = logicalWidth / 10;
final Rect cf = new Rect(xInset, 0, logicalWidth - xInset, logicalHeight);
- Configuration config = new Configuration(w.mAppToken.getRequestedOverrideConfiguration());
+ Configuration config = new Configuration(w.mActivityRecord.getRequestedOverrideConfiguration());
config.windowConfiguration.setBounds(cf);
config.windowConfiguration.setAppBounds(cf);
- w.mAppToken.onRequestedOverrideConfigurationChanged(config);
+ w.mActivityRecord.onRequestedOverrideConfigurationChanged(config);
pf.set(0, 0, logicalWidth, logicalHeight);
task.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
task.setBounds(null);
@@ -549,11 +549,11 @@
attrs.width = width;
attrs.height = height;
- AppWindowToken token = createAppWindowToken(mTestDisplayContent,
+ ActivityRecord activity = createActivityRecord(mTestDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- FrameTestWindowState ws = new FrameTestWindowState(mWm, mIWindow, token, attrs);
- token.addWindow(ws);
+ FrameTestWindowState ws = new FrameTestWindowState(mWm, mIWindow, activity, attrs);
+ activity.addWindow(ws);
return ws;
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
index a09253a..1a4562b 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
@@ -303,11 +303,11 @@
@Test
public void testPrepareWindowToDisplayDuringRelayout() {
// Call prepareWindowToDisplayDuringRelayout for a window without FLAG_TURN_SCREEN_ON before
- // calling setCurrentLaunchCanTurnScreenOn for windows with flag in the same appWindowToken.
- final AppWindowToken appWindowToken = createAppWindowToken(mDisplayContent,
+ // calling setCurrentLaunchCanTurnScreenOn for windows with flag in the same activity.
+ final ActivityRecord activity = createActivityRecord(mDisplayContent,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
- final WindowState first = createWindow(null, TYPE_APPLICATION, appWindowToken, "first");
- final WindowState second = createWindow(null, TYPE_APPLICATION, appWindowToken, "second");
+ final WindowState first = createWindow(null, TYPE_APPLICATION, activity, "first");
+ final WindowState second = createWindow(null, TYPE_APPLICATION, activity, "second");
second.mAttrs.flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
testPrepareWindowToDisplayDuringRelayout(first, false /* expectedWakeupCalled */,
@@ -316,8 +316,8 @@
false /* expectedCurrentLaunchCanTurnScreenOn */);
// Call prepareWindowToDisplayDuringRelayout for two window that have FLAG_TURN_SCREEN_ON
- // from the same appWindowToken. Only one should trigger the wakeup.
- appWindowToken.setCurrentLaunchCanTurnScreenOn(true);
+ // from the same activity. Only one should trigger the wakeup.
+ activity.setCurrentLaunchCanTurnScreenOn(true);
first.mAttrs.flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
second.mAttrs.flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
@@ -328,15 +328,15 @@
// Without window flags, the state of ActivityRecord.canTurnScreenOn should still be able to
// turn on the screen.
- appWindowToken.setCurrentLaunchCanTurnScreenOn(true);
+ activity.setCurrentLaunchCanTurnScreenOn(true);
first.mAttrs.flags &= ~WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
- doReturn(true).when(appWindowToken).canTurnScreenOn();
+ doReturn(true).when(activity).canTurnScreenOn();
testPrepareWindowToDisplayDuringRelayout(first, true /* expectedWakeupCalled */,
false /* expectedCurrentLaunchCanTurnScreenOn */);
// Call prepareWindowToDisplayDuringRelayout for a windows that are not children of an
- // appWindowToken. Both windows have the FLAG_TURNS_SCREEN_ON so both should call wakeup
+ // activity. Both windows have the FLAG_TURNS_SCREEN_ON so both should call wakeup
final WindowToken windowToken = WindowTestUtils.createTestWindowToken(FIRST_SUB_WINDOW,
mDisplayContent);
final WindowState firstWindow = createWindow(null, TYPE_APPLICATION, windowToken,
@@ -371,7 +371,7 @@
}
// If wakeup is expected to be called, the currentLaunchCanTurnScreenOn should be false
// because the state will be consumed.
- assertThat(appWindow.mAppToken.currentLaunchCanTurnScreenOn(),
+ assertThat(appWindow.mActivityRecord.currentLaunchCanTurnScreenOn(),
is(expectedCurrentLaunchCanTurnScreenOn));
}
@@ -555,7 +555,7 @@
// Mock active recents animation
RecentsAnimationController recentsController = mock(RecentsAnimationController.class);
- when(recentsController.isAnimatingTask(win0.mAppToken.getTask())).thenReturn(true);
+ when(recentsController.isAnimatingTask(win0.mActivityRecord.getTask())).thenReturn(true);
mWm.setRecentsAnimationController(recentsController);
assertTrue(win0.cantReceiveTouchInput());
}
@@ -563,14 +563,14 @@
@Test
public void testCantReceiveTouchWhenAppTokenHiddenRequested() {
final WindowState win0 = createWindow(null, TYPE_APPLICATION, "win0");
- win0.mAppToken.hiddenRequested = true;
+ win0.mActivityRecord.hiddenRequested = true;
assertTrue(win0.cantReceiveTouchInput());
}
@Test
public void testCantReceiveTouchWhenShouldIgnoreInput() {
final WindowState win0 = createWindow(null, TYPE_APPLICATION, "win0");
- win0.mAppToken.getStack().setAdjustedForMinimizedDock(1 /* Any non 0 value works */);
+ win0.mActivityRecord.getStack().setAdjustedForMinimizedDock(1 /* Any non 0 value works */);
assertTrue(win0.cantReceiveTouchInput());
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
index f44c969..4fbf820 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
@@ -27,6 +27,8 @@
import android.view.IWindow;
import android.view.WindowManager;
+import com.android.server.wm.ActivityTestsBase.ActivityBuilder;
+
/**
* A collection of static functions that provide access to WindowManager related test functionality.
*/
@@ -44,23 +46,21 @@
}
}
- /** Creates an {@link AppWindowToken} and adds it to the specified {@link Task}. */
- static ActivityRecord createAppWindowTokenInTask(DisplayContent dc, Task task) {
- final ActivityRecord newToken = createTestAppWindowToken(dc);
- task.addChild(newToken, POSITION_TOP);
- return newToken;
+ /** Creates an {@link ActivityRecord} and adds it to the specified {@link Task}. */
+ static ActivityRecord createActivityRecordInTask(DisplayContent dc, Task task) {
+ final ActivityRecord activity = createTestActivityRecord(dc);
+ task.addChild(activity, POSITION_TOP);
+ return activity;
}
- static ActivityRecord createTestAppWindowToken(DisplayContent dc) {
+ static ActivityRecord createTestActivityRecord(DisplayContent dc) {
synchronized (dc.mWmService.mGlobalLock) {
- final ActivityRecord r =
- new ActivityTestsBase.ActivityBuilder(dc.mWmService.mAtmService)
- .build();
- r.onDisplayChanged(dc);
- r.setOccludesParent(true);
- r.setHidden(false);
- r.hiddenRequested = false;
- return r;
+ final ActivityRecord activity = new ActivityBuilder(dc.mWmService.mAtmService).build();
+ activity.onDisplayChanged(dc);
+ activity.setOccludesParent(true);
+ activity.setHidden(false);
+ activity.hiddenRequested = false;
+ return activity;
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
index 1fce46c..af9c510 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
@@ -200,22 +200,22 @@
return WindowTestUtils.createTestWindowToken(type, dc);
}
- return createAppWindowToken(dc, windowingMode, activityType);
+ return createActivityRecord(dc, windowingMode, activityType);
}
}
- ActivityRecord createAppWindowToken(DisplayContent dc, int windowingMode, int activityType) {
- return createTestAppWindowToken(dc, windowingMode, activityType);
+ ActivityRecord createActivityRecord(DisplayContent dc, int windowingMode, int activityType) {
+ return createTestActivityRecord(dc, windowingMode, activityType);
}
- ActivityRecord createTestAppWindowToken(DisplayContent dc, int
+ ActivityRecord createTestActivityRecord(DisplayContent dc, int
windowingMode, int activityType) {
final TaskStack stack = createTaskStackOnDisplay(windowingMode, activityType, dc);
final Task task = createTaskInStack(stack, 0 /* userId */);
- final ActivityRecord appWindowToken =
- WindowTestUtils.createTestAppWindowToken(dc);
- task.addChild(appWindowToken, 0);
- return appWindowToken;
+ final ActivityRecord activity =
+ WindowTestUtils.createTestActivityRecord(dc);
+ task.addChild(activity, 0);
+ return activity;
}
WindowState createWindow(WindowState parent, int type, String name) {
@@ -244,9 +244,10 @@
WindowState createAppWindow(Task task, int type, String name) {
synchronized (mWm.mGlobalLock) {
- final ActivityRecord token = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- task.addChild(token, 0);
- return createWindow(null, type, token, name);
+ final ActivityRecord activity =
+ WindowTestUtils.createTestActivityRecord(mDisplayContent);
+ task.addChild(activity, 0);
+ return createWindow(null, type, activity, name);
}
}