Merge "Only capture activity snapshot if the app has adapted to onBackInvoked" into main (59a677b5) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -98,13 +98,18 @@ class SnapshotController {
		final TaskFragment tf = info.mContainer.asTaskFragment();
		final ActivityRecord ar = tf != null ? tf.getTopMostActivity()
		: info.mContainer.asActivityRecord();
		final boolean taskVis = ar != null && ar.getTask().isVisibleRequested();
		if (ar != null && !ar.isVisibleRequested() && taskVis) {
		if (ar != null && !ar.isVisibleRequested() && ar.getTask().isVisibleRequested()) {
		final WindowState mainWindow = ar.findMainWindow(false);
		// Only capture activity snapshot if this app has adapted to back predict
		if (mainWindow != null
		&& mainWindow.getOnBackInvokedCallbackInfo() != null
		&& mainWindow.getOnBackInvokedCallbackInfo().isSystemCallback()) {
		mActivitySnapshotController.recordSnapshot(ar);
		}
		}
		}
		}
		}

		void onTransitionFinish(@WindowManager.TransitionType int type,
		ArrayList<Transition.ChangeInfo> changeInfos) {