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

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

@@ -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

@@ -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

@@ -302,7 +302,7 @@ public class VirtualDisplayAdapter extends DisplayAdapter {
         }
 
         @Override
-        public Point getDisplaySurfaceDefaultSize() {
+        public Point getDisplaySurfaceDefaultSizeLocked() {
             if (mSurface == null) {
                 return null;
             }