Merge "Fixes PiP transition with autoEnterPip in button nav" into sc-dev (38ab224e) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −12

Original line number	Diff line number	Diff line
		@@ -1075,12 +1075,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",
		@@ -2821,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",
		@@ -3331,6 +3319,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",

+5 −9

Original line number	Diff line number	Diff line
		@@ -5855,12 +5855,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
		@@ -5883,9 +5879,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();
		}