diff options
| -rw-r--r-- | data/etc/services.core.protolog.json | 48 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 14 |
2 files changed, 11 insertions, 51 deletions
diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 222c9bdf2cb4..405e6cc6720c 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -811,12 +811,6 @@ "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" - }, "-1142279614": { "message": "Looking for focus: %s, flags=%d, canReceive=%b, reason=%s", "level": "VERBOSE", @@ -1087,12 +1081,6 @@ "group": "WM_DEBUG_IME", "at": "com\/android\/server\/wm\/ImeInsetsSourceProvider.java" }, - "-856025122": { - "message": "SURFACE transparentRegionHint=%s: %s", - "level": "INFO", - "group": "WM_SHOW_TRANSACTIONS", - "at": "com\/android\/server\/wm\/WindowManagerService.java" - }, "-855366859": { "message": " merging children in from %s: %s", "level": "VERBOSE", @@ -1261,12 +1249,6 @@ "group": "WM_DEBUG_STATES", "at": "com\/android\/server\/wm\/ActivityTaskSupervisor.java" }, - "-639305784": { - "message": "Could not report config changes to the window token client.", - "level": "WARN", - "group": "WM_ERROR", - "at": "com\/android\/server\/wm\/WindowToken.java" - }, "-639217716": { "message": "setFocusedApp %s displayId=%d Callers=%s", "level": "INFO", @@ -1417,12 +1399,6 @@ "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" - }, "-463348344": { "message": "Removing and adding activity %s to root task at top callers=%s", "level": "INFO", @@ -1903,12 +1879,6 @@ "group": "WM_DEBUG_FOCUS_LIGHT", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, - "123161180": { - "message": "SEVER CHILDREN", - "level": "INFO", - "group": "WM_SHOW_TRANSACTIONS", - "at": "com\/android\/server\/wm\/WindowSurfaceController.java" - }, "140319294": { "message": "IME target changed within ActivityRecord", "level": "DEBUG", @@ -2569,12 +2539,6 @@ "group": "WM_DEBUG_REMOTE_ANIMATIONS", "at": "com\/android\/server\/wm\/RemoteAnimationController.java" }, - "838570988": { - "message": "Could not report token removal to the window token client.", - "level": "WARN", - "group": "WM_ERROR", - "at": "com\/android\/server\/wm\/WindowToken.java" - }, "872933199": { "message": "Changing focus from %s to %s displayId=%d Callers=%s", "level": "DEBUG", @@ -2851,12 +2815,6 @@ "group": "WM_ERROR", "at": "com\/android\/server\/wm\/WindowManagerService.java" }, - "1217926207": { - "message": "Activity not running, resuming next.", - "level": "VERBOSE", - "group": "WM_DEBUG_STATES", - "at": "com\/android\/server\/wm\/Task.java" - }, "1219600119": { "message": "addWindow: win=%s Callers=%s", "level": "DEBUG", @@ -3355,6 +3313,12 @@ "group": "WM_DEBUG_STATES", "at": "com\/android\/server\/wm\/Task.java" }, + "1847414670": { + "message": "Activity not running or entered PiP, resuming next.", + "level": "VERBOSE", + "group": "WM_DEBUG_STATES", + "at": "com\/android\/server\/wm\/Task.java" + }, "1853793312": { "message": "Notify removed startingWindow %s", "level": "VERBOSE", diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 9c8a997ec098..c3cf1c519dcd 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -5844,12 +5844,8 @@ class Task extends WindowContainer<WindowContainer> { mTaskSupervisor.acquireLaunchWakelock(); } - if (didAutoPip) { - // Already entered PIP mode, no need to keep pausing. - return true; - } - - if (mPausingActivity != null) { + // If already entered PIP mode, no need to keep pausing. + if (mPausingActivity != null && !didAutoPip) { // Have the window manager pause its key dispatching until the new // activity has started. If we're pausing the activity just because // the screen is being turned off and the UI is sleeping, don't interrupt @@ -5872,9 +5868,9 @@ class Task extends WindowContainer<WindowContainer> { } } else { - // This activity failed to schedule the - // pause, so just treat it as being paused now. - ProtoLog.v(WM_DEBUG_STATES, "Activity not running, resuming next."); + // This activity either failed to schedule the pause or it entered PIP mode, + // so just treat it as being paused now. + ProtoLog.v(WM_DEBUG_STATES, "Activity not running or entered PiP, resuming next."); if (resuming == null) { mRootWindowContainer.resumeFocusedTasksTopActivities(); } |