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

Commit 7d109f38 authored Mar 24, 2022 by Rupesh Bansal Committed by Automerger Merge Worker Mar 24, 2022

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

Merge "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." into tm-dev am: c47e9d00

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17238069

Change-Id: I76cef670aac7a109797efa2bcd7d01dd76ff4f27

parents 30d241d3 c47e9d00

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;
		}