Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a85809c authored Mar 17, 2022 by Rupesh Bansal

When a Virtual Display is plugged in, we create a corresponding surface

whose mutation should be owned by mSyncRoot(Owned by
DisplayManagerService). However, there is an operation of getting the
defaultSize of this Display which is performed without honouring the
mSyncRoot.

Bug: 211153738
Test: Manual
Change-Id: I5bedf0f25dc4635d828b96312f7f799fb9ed321c

parent 379a8705

services/core/java/com/android/server/display/DisplayDevice.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ abstract class DisplayDevice {
		* Only used for mirroring started from MediaProjection.
		*/
		@Nullable
		public Point getDisplaySurfaceDefaultSize() {
		public Point getDisplaySurfaceDefaultSizeLocked() {
		return null;
		}

services/core/java/com/android/server/display/DisplayManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3880,8 +3880,8 @@ public final class DisplayManagerService extends SystemService {
		if (device == null) {
		return null;
		}
		return device.getDisplaySurfaceDefaultSizeLocked();
		}
		return device.getDisplaySurfaceDefaultSize();
		}

		@Override

services/core/java/com/android/server/display/VirtualDisplayAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -302,7 +302,7 @@ public class VirtualDisplayAdapter extends DisplayAdapter {
		}

		@Override
		public Point getDisplaySurfaceDefaultSize() {
		public Point getDisplaySurfaceDefaultSizeLocked() {
		if (mSurface == null) {
		return null;
		}