Merge "Lock mirrorSurfaceControl" into main (bc4584bc) · Commits · e / os / android_frameworks_base

core/java/android/service/wallpaper/WallpaperService.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -2667,7 +2667,15 @@ public abstract class WallpaperService extends Service {

		@Nullable
		public SurfaceControl mirrorSurfaceControl() {
		return mEngine == null ? null : SurfaceControl.mirrorSurface(mEngine.mSurfaceControl);
		if (mEngine == null) {
		return null;
		}
		synchronized (mEngine.mSurfaceReleaseLock) {
		if (mEngine.mSurfaceControl == null) {
		return null;
		}
		return SurfaceControl.mirrorSurface(mEngine.mSurfaceControl);
		}
		}

		@Nullable