Merge changes Ie43e3cc8,Ie5aed430 (9b61c3db) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceView.java

+33 −6

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ import java.util.concurrent.locks.ReentrantLock;
		* artifacts may occur on previous versions of the platform when its window is
		* positioned asynchronously.</p>
		*/
		public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallback {
		public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCallback {
		private static final String TAG = "SurfaceView";
		private static final boolean DEBUG = false;
		private static final boolean DEBUG_POSITION = false;
		@@ -227,9 +227,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		mRequestedVisible = mViewVisibility && mWindowVisibility && !mWindowStopped;
		}

		/** @hide */
		@Override
		public void windowStopped(boolean stopped) {
		private void setWindowStopped(boolean stopped) {
		mWindowStopped = stopped;
		updateRequestedVisibility();
		updateSurface();
		@@ -239,7 +237,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();

		getViewRootImpl().addWindowStoppedCallback(this);
		getViewRootImpl().addSurfaceChangedCallback(this);
		mWindowStopped = false;

		mViewVisibility = getVisibility() == VISIBLE;
		@@ -459,7 +457,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		// the lifecycle. Instead of attaching it to a view, he/she can just pass
		// the SurfaceHolder forward, most live wallpapers do it.
		if (viewRoot != null) {
		viewRoot.removeWindowStoppedCallback(this);
		viewRoot.removeSurfaceChangedCallback(this);
		}

		mAttachedToWindow = false;
		@@ -1349,4 +1347,33 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		public SurfaceControl getSurfaceControl() {
		return mSurfaceControl;
		}

		/**
		* Set window stopped to false and update surface visibility when ViewRootImpl surface is
		* created.
		* @hide
		*/
		@Override
		public void surfaceCreated(SurfaceControl.Transaction t) {
		setWindowStopped(false);
		}

		/**
		* Set window stopped to true and update surface visibility when ViewRootImpl surface is
		* destroyed.
		* @hide
		*/
		@Override
		public void surfaceDestroyed() {
		setWindowStopped(true);
		}

		/**
		* Called when a valid ViewRootImpl surface is replaced by another valid surface.
		* @hide
		*/
		@Override
		public void surfaceReplaced(SurfaceControl.Transaction t) {

		}
		}

core/java/android/view/ViewRootImpl.java

+113 −70

Original line number	Diff line number	Diff line
		@@ -477,6 +477,12 @@ public final class ViewRootImpl implements ViewParent,
		public final Surface mSurface = new Surface();
		private final SurfaceControl mSurfaceControl = new SurfaceControl();

		/**
		* Transaction object that can be used to synchronize child SurfaceControl changes with
		* ViewRootImpl SurfaceControl changes by the server. The object is passed along with
		* the SurfaceChangedCallback.
		*/
		private final Transaction mSurfaceChangedTransaction = new Transaction();
		/**
		* Child surface of {@code mSurface} with the same bounds as its parent, and crop bounds
		* are set to the parent's bounds adjusted for surface insets. This surface is created when
		@@ -1541,19 +1547,6 @@ public final class ViewRootImpl implements ViewParent,
		mIsAmbientMode = ambient;
		}

		interface WindowStoppedCallback {
		public void windowStopped(boolean stopped);
		}
		private final ArrayList<WindowStoppedCallback> mWindowStoppedCallbacks = new ArrayList<>();

		void addWindowStoppedCallback(WindowStoppedCallback c) {
		mWindowStoppedCallbacks.add(c);
		}

		void removeWindowStoppedCallback(WindowStoppedCallback c) {
		mWindowStoppedCallbacks.remove(c);
		}

		void setWindowStopped(boolean stopped) {
		checkThread();
		if (mStopped != stopped) {
		@@ -1570,14 +1563,11 @@ public final class ViewRootImpl implements ViewParent,
		if (renderer != null) {
		renderer.destroyHardwareResources(mView);
		}
		}

		for (int i = 0; i < mWindowStoppedCallbacks.size(); i++) {
		mWindowStoppedCallbacks.get(i).windowStopped(stopped);
		if (mSurface.isValid()) {
		if (mSurfaceHolder != null) {
		notifyHolderSurfaceDestroyed();
		}

		if (mStopped) {
		if (mSurfaceHolder != null && mSurface.isValid()) {
		notifySurfaceDestroyed();
		}
		destroySurface();
		@@ -1585,6 +1575,46 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		/** Register callbacks to be notified when the ViewRootImpl surface changes. */
		interface SurfaceChangedCallback {
		void surfaceCreated(Transaction t);
		void surfaceReplaced(Transaction t);
		void surfaceDestroyed();
		}

		private final ArrayList<SurfaceChangedCallback> mSurfaceChangedCallbacks = new ArrayList<>();
		void addSurfaceChangedCallback(SurfaceChangedCallback c) {
		mSurfaceChangedCallbacks.add(c);
		}

		void removeSurfaceChangedCallback(SurfaceChangedCallback c) {
		mSurfaceChangedCallbacks.remove(c);
		}

		private void notifySurfaceCreated() {
		for (int i = 0; i < mSurfaceChangedCallbacks.size(); i++) {
		mSurfaceChangedCallbacks.get(i).surfaceCreated(mSurfaceChangedTransaction);
		}
		}

		/**
		* Notify listeners when the ViewRootImpl surface has been replaced. This callback will not be
		* called if a new surface is created, only if the valid surface has been replaced with another
		* valid surface.
		*/
		private void notifySurfaceReplaced() {
		for (int i = 0; i < mSurfaceChangedCallbacks.size(); i++) {
		mSurfaceChangedCallbacks.get(i).surfaceReplaced(mSurfaceChangedTransaction);
		}
		}

		private void notifySurfaceDestroyed() {
		for (int i = 0; i < mSurfaceChangedCallbacks.size(); i++) {
		mSurfaceChangedCallbacks.get(i).surfaceDestroyed();
		}
		}


		/**
		* Creates a surface as a child of {@code mSurface} with the same bounds as its parent and
		* crop bounds set to the parent's bounds adjusted for surface insets.
		@@ -1984,7 +2014,7 @@ public final class ViewRootImpl implements ViewParent,
		mIsInTraversal = true;
		mWillDrawSoon = true;
		boolean windowSizeMayChange = false;
		boolean surfaceChanged = false;
		final boolean windowAttributesChanged = mWindowAttributesChanged;
		WindowManager.LayoutParams lp = mWindowAttributes;

		int desiredWindowWidth;
		@@ -2003,7 +2033,6 @@ public final class ViewRootImpl implements ViewParent,
		WindowManager.LayoutParams params = null;
		if (mWindowAttributesChanged) {
		mWindowAttributesChanged = false;
		surfaceChanged = true;
		params = lp;
		}
		CompatibilityInfo compatibilityInfo =
		@@ -2244,6 +2273,10 @@ public final class ViewRootImpl implements ViewParent,
		final boolean isViewVisible = viewVisibility == View.VISIBLE;
		final boolean windowRelayoutWasForced = mForceNextWindowRelayout;
		boolean surfaceSizeChanged = false;
		boolean surfaceCreated = false;
		boolean surfaceDestroyed = false;
		/* True if surface generation id changes. */
		boolean surfaceReplaced = false;

		if (mFirst \|\| windowShouldResize \|\| insetsChanged \|\|
		viewVisibilityChanged \|\| params != null \|\| mForceNextWindowRelayout) {
		@@ -2325,10 +2358,14 @@ public final class ViewRootImpl implements ViewParent,
		final boolean outsetsChanged = !mPendingOutsets.equals(mAttachInfo.mOutsets);
		surfaceSizeChanged = (relayoutResult
		& WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED) != 0;
		surfaceChanged \|= surfaceSizeChanged;
		final boolean alwaysConsumeSystemBarsChanged =
		mPendingAlwaysConsumeSystemBars != mAttachInfo.mAlwaysConsumeSystemBars;
		final boolean colorModeChanged = hasColorModeChanged(lp.getColorMode());
		surfaceCreated = !hadSurface && mSurface.isValid();
		surfaceDestroyed = hadSurface && !mSurface.isValid();
		surfaceReplaced = (surfaceGenerationId != mSurface.getGenerationId())
		&& mSurface.isValid();

		if (contentInsetsChanged) {
		mAttachInfo.mContentInsets.set(mPendingContentInsets);
		if (DEBUG_LAYOUT) Log.v(mTag, "Content insets changing to: "
		@@ -2383,8 +2420,7 @@ public final class ViewRootImpl implements ViewParent,
		lp.getColorMode() == ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT);
		}

		if (!hadSurface) {
		if (mSurface.isValid()) {
		if (surfaceCreated) {
		// If we are creating a new surface, then we need to
		// completely redraw it.
		mFullRedrawNeeded = true;
		@@ -2408,8 +2444,8 @@ public final class ViewRootImpl implements ViewParent,
		return;
		}
		}
		}
		} else if (!mSurface.isValid()) {
		notifySurfaceCreated();
		} else if (surfaceDestroyed) {
		// If the surface has been removed, then reset the scroll
		// positions.
		if (mLastScrolledFocus != null) {
		@@ -2427,10 +2463,12 @@ public final class ViewRootImpl implements ViewParent,
		mAttachInfo.mThreadedRenderer.isEnabled()) {
		mAttachInfo.mThreadedRenderer.destroy();
		}
		} else if ((surfaceGenerationId != mSurface.getGenerationId()
		notifySurfaceDestroyed();
		} else if ((surfaceReplaced
		\|\| surfaceSizeChanged \|\| windowRelayoutWasForced \|\| colorModeChanged)
		&& mSurfaceHolder == null
		&& mAttachInfo.mThreadedRenderer != null) {
		&& mAttachInfo.mThreadedRenderer != null
		&& mSurface.isValid()) {
		mFullRedrawNeeded = true;
		try {
		// Need to do updateSurface (which leads to CanvasContext::setSurface and
		@@ -2448,6 +2486,10 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		if (!surfaceCreated && surfaceReplaced) {
		notifySurfaceReplaced();
		}

		final boolean freeformResizing = (relayoutResult
		& WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_FREEFORM) != 0;
		final boolean dockedResizing = (relayoutResult
		@@ -2503,31 +2545,32 @@ public final class ViewRootImpl implements ViewParent,
		}
		mSurfaceHolder.setSurfaceFrameSize(mWidth, mHeight);
		mSurfaceHolder.mSurfaceLock.unlock();
		if (mSurface.isValid()) {
		if (!hadSurface) {
		if (surfaceCreated) {
		mSurfaceHolder.ungetCallbacks();

		mIsCreating = true;
		SurfaceHolder.Callback callbacks[] = mSurfaceHolder.getCallbacks();
		SurfaceHolder.Callback[] callbacks = mSurfaceHolder.getCallbacks();
		if (callbacks != null) {
		for (SurfaceHolder.Callback c : callbacks) {
		c.surfaceCreated(mSurfaceHolder);
		}
		}
		surfaceChanged = true;
		}
		if (surfaceChanged \|\| surfaceGenerationId != mSurface.getGenerationId()) {
		SurfaceHolder.Callback callbacks[] = mSurfaceHolder.getCallbacks();

		if ((surfaceCreated \|\| surfaceReplaced \|\| surfaceSizeChanged
		\|\| windowAttributesChanged) && mSurface.isValid()) {
		SurfaceHolder.Callback[] callbacks = mSurfaceHolder.getCallbacks();
		if (callbacks != null) {
		for (SurfaceHolder.Callback c : callbacks) {
		c.surfaceChanged(mSurfaceHolder, lp.format,
		mWidth, mHeight);
		}
		}
		}
		mIsCreating = false;
		} else if (hadSurface) {
		notifySurfaceDestroyed();
		}

		if (surfaceDestroyed) {
		notifyHolderSurfaceDestroyed();
		mSurfaceHolder.mSurfaceLock.lock();
		try {
		mSurfaceHolder.mSurface = new Surface();
		@@ -2841,7 +2884,7 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		private void notifySurfaceDestroyed() {
		private void notifyHolderSurfaceDestroyed() {
		mSurfaceHolder.ungetCallbacks();
		SurfaceHolder.Callback[] callbacks = mSurfaceHolder.getCallbacks();
		if (callbacks != null) {
		@@ -3447,7 +3490,7 @@ public final class ViewRootImpl implements ViewParent,
		private void reportDrawFinished() {
		try {
		mDrawsNeededToReport = 0;
		mWindowSession.finishDrawing(mWindow, null /* postDrawTransaction */);
		mWindowSession.finishDrawing(mWindow, mSurfaceChangedTransaction);
		} catch (RemoteException e) {
		// Have fun!
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1299,7 +1299,7 @@ class WindowStateAnimator {
		mSurfaceController.mSurfaceControl);
		}

		mPostDrawTransaction.apply();
		SurfaceControl.mergeToGlobalTransaction(mPostDrawTransaction);
		return true;
		}