Merge changes I91762453,Ic1abc3c0 (98434ff9) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+0 −172

Original line number	Diff line number	Diff line
		@@ -1598,97 +1598,6 @@ public final class SurfaceControl implements Parcelable {
		}
		}

		/**
		* @hide
		*/
		public void deferTransactionUntil(SurfaceControl barrier, long frame) {
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.deferTransactionUntil(this, barrier, frame);
		}
		}

		/**
		* @hide
		*/
		public void reparentChildren(SurfaceControl newParent) {
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.reparentChildren(this, newParent);
		}
		}

		/**
		* @hide
		*/
		public void detachChildren() {
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.detachChildren(this);
		}
		}

		/**
		* @hide
		*/
		@UnsupportedAppUsage
		public void setLayer(int zorder) {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.setLayer(this, zorder);
		}
		}

		/**
		* @hide
		*/
		@UnsupportedAppUsage
		public void setPosition(float x, float y) {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.setPosition(this, x, y);
		}
		}

		/**
		* @hide
		*/
		public void setBufferSize(int w, int h) {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.setBufferSize(this, w, h);
		}
		}

		/**
		* @hide
		*/
		@UnsupportedAppUsage
		public void hide() {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.hide(this);
		}
		}

		/**
		* @hide
		*/
		@UnsupportedAppUsage
		public void show() {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.show(this);
		}
		}

		/**
		* @hide
		*/
		public void setTransparentRegionHint(Region region) {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.setTransparentRegionHint(this, region);
		}
		}

		/**
		* @hide
		*/
		@@ -1719,87 +1628,6 @@ public final class SurfaceControl implements Parcelable {
		return nativeGetAnimationFrameStats(outStats);
		}

		/**
		* @hide
		*/
		public void setAlpha(float alpha) {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.setAlpha(this, alpha);
		}
		}

		/**
		* @hide
		*/
		public void setBackgroundBlurRadius(int blur) {
		checkNotReleased();
		synchronized (SurfaceControl.class) {
		sGlobalTransaction.setBackgroundBlurRadius(this, blur);
		}
		}

		/**
		* @hide
		*/
		public void setMatrix(float dsdx, float dtdx, float dtdy, float dsdy) {
		checkNotReleased();
		synchronized(SurfaceControl.class) {
		sGlobalTransaction.setMatrix(this, dsdx, dtdx, dtdy, dsdy);
		}
		}

		/**
		* Sets the Surface to be color space agnostic. If a surface is color space agnostic,
		* the color can be interpreted in any color space.
		* @param agnostic A boolean to indicate whether the surface is color space agnostic
		* @hide
		*/
		public void setColorSpaceAgnostic(boolean agnostic) {
		checkNotReleased();
		synchronized (SurfaceControl.class) {
		sGlobalTransaction.setColorSpaceAgnostic(this, agnostic);
		}
		}

		/**
		* Bounds the surface and its children to the bounds specified. Size of the surface will be
		* ignored and only the crop and buffer size will be used to determine the bounds of the
		* surface. If no crop is specified and the surface has no buffer, the surface bounds is only
		* constrained by the size of its parent bounds.
		*
		* @param crop Bounds of the crop to apply.
		* @hide
		*/
		public void setWindowCrop(Rect crop) {
		checkNotReleased();
		synchronized (SurfaceControl.class) {
		sGlobalTransaction.setWindowCrop(this, crop);
		}
		}

		/**
		* @hide
		*/
		public void setOpaque(boolean isOpaque) {
		checkNotReleased();

		synchronized (SurfaceControl.class) {
		sGlobalTransaction.setOpaque(this, isOpaque);
		}
		}

		/**
		* @hide
		*/
		public void setSecure(boolean isSecure) {
		checkNotReleased();

		synchronized (SurfaceControl.class) {
		sGlobalTransaction.setSecure(this, isSecure);
		}
		}

		/**
		* @hide
		*/

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

+9 −8

Original line number	Diff line number	Diff line
		@@ -95,18 +95,18 @@ import static android.view.Display.COLOR_MODE_DEFAULT;
		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.TRANSIT_CLOSE;
		import static android.view.WindowManager.TRANSIT_OLD_ACTIVITY_CLOSE;
		import static android.view.WindowManager.TRANSIT_OLD_TASK_CLOSE;
		import static android.view.WindowManager.TRANSIT_OLD_TASK_OPEN_BEHIND;
		import static android.view.WindowManager.TRANSIT_OLD_UNSET;
		import static android.view.SurfaceControl.getGlobalTransaction;
		import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
		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_CLOSE;
		import static android.view.WindowManager.TRANSIT_FLAG_OPEN_BEHIND;
		import static android.view.WindowManager.TRANSIT_OLD_ACTIVITY_CLOSE;
		import static android.view.WindowManager.TRANSIT_OLD_TASK_CLOSE;
		import static android.view.WindowManager.TRANSIT_OLD_UNSET;

		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ADD_REMOVE;
		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS;
		@@ -182,7 +182,6 @@ import static com.android.server.wm.IdentifierProto.USER_ID;
		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;
		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;
		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;
		import static com.android.server.wm.Task.TASK_VISIBILITY_VISIBLE;
		import static com.android.server.wm.Task.ActivityState.DESTROYED;
		import static com.android.server.wm.Task.ActivityState.DESTROYING;
		import static com.android.server.wm.Task.ActivityState.FINISHING;
		@@ -194,6 +193,7 @@ import static com.android.server.wm.Task.ActivityState.RESUMED;
		import static com.android.server.wm.Task.ActivityState.STARTED;
		import static com.android.server.wm.Task.ActivityState.STOPPED;
		import static com.android.server.wm.Task.ActivityState.STOPPING;
		import static com.android.server.wm.Task.TASK_VISIBILITY_VISIBLE;
		import static com.android.server.wm.TaskPersister.DEBUG;
		import static com.android.server.wm.TaskPersister.IMAGE_EXTENSION;
		import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
		@@ -3137,7 +3137,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		SurfaceControl.openTransaction();
		for (int i = mChildren.size() - 1; i >= 0; i--) {
		final WindowState w = mChildren.get(i);
		w.mWinAnimator.detachChildren();
		w.mWinAnimator.detachChildren(getGlobalTransaction());
		}
		SurfaceControl.closeTransaction();
		}
		@@ -4449,7 +4449,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		SurfaceControl.openTransaction();
		try {
		forAllWindows(win -> {
		win.mWinAnimator.hide("immediately hidden"); }, true);
		win.mWinAnimator.hide(getGlobalTransaction(), "immediately hidden");
		}, true);
		} finally {
		SurfaceControl.closeTransaction();
		}

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -3401,6 +3401,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		boolean destroyLeakedSurfaces() {
		// Used to indicate that a surface was leaked.
		mTmpWindow = null;
		final Transaction t = mWmService.mTransactionFactory.get();
		forAllWindows(w -> {
		final WindowStateAnimator wsa = w.mWinAnimator;
		if (wsa.mSurfaceController == null) {
		@@ -3412,7 +3413,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		+ " token=" + w.mToken
		+ " pid=" + w.mSession.mPid
		+ " uid=" + w.mSession.mUid);
		wsa.destroySurface();
		wsa.destroySurface(t);
		mWmService.mForceRemoves.add(w);
		mTmpWindow = w;
		} else if (w.mActivityRecord != null && !w.mActivityRecord.isClientVisible()) {
		@@ -3420,10 +3421,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		+ w + " surface=" + wsa.mSurfaceController
		+ " token=" + w.mActivityRecord);
		ProtoLog.i(WM_SHOW_TRANSACTIONS, "SURFACE LEAK DESTROY: %s", w);
		wsa.destroySurface();
		wsa.destroySurface(t);
		mTmpWindow = w;
		}
		}, false /* traverseTopToBottom */);
		t.apply();

		return mTmpWindow != null;
		}

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -778,7 +778,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		if (surfaceController != null) {
		ProtoLog.i(WM_SHOW_SURFACE_ALLOC,
		"SURFACE RECOVER DESTROY: %s", winAnimator.mWin);
		winAnimator.destroySurface();
		SurfaceControl.Transaction t = mWmService.mTransactionFactory.get();
		winAnimator.destroySurface(t);
		t.apply();
		if (winAnimator.mWin.mActivityRecord != null) {
		winAnimator.mWin.mActivityRecord.removeStartingWindow();
		}
		@@ -926,7 +928,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		displayContent.pendingLayoutChanges \|= FINISH_LAYOUT_REDO_WALLPAPER;
		}
		win.destroySurfaceUnchecked();
		win.mWinAnimator.destroyPreservedSurfaceLocked();
		win.mWinAnimator.destroyPreservedSurfaceLocked(win.getSyncTransaction());
		} while (i > 0);
		mWmService.mDestroySurface.clear();
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ class TaskScreenshotAnimatable implements SurfaceAnimator.Animatable {
		surface.attachAndQueueBufferWithColorSpace(buffer, screenshotBuffer.getColorSpace());
		surface.release();
		final float scale = 1.0f * mTask.getBounds().width() / mWidth;
		mSurfaceControl.setMatrix(scale, 0, 0, scale);
		getPendingTransaction().setMatrix(mSurfaceControl, scale, 0, 0, scale);
		}
		getPendingTransaction().show(mSurfaceControl);
		}