From 154a9415e99af1369cabd1624483fff40487ec7a Mon Sep 17 00:00:00 2001
From: Kriti Dang <kritidang@google.com>
Date: Tue, 8 Mar 2022 20:26:17 +0100
Subject: [PATCH] Changing the order where getBootDisplayModeSupport is called

The LocalDisplayAdapter was refactored to getBootDisplayModeSupport in
its constructor. Changing the corresponding mock call before adapter
gets created in the test.

Bug: 223401286
Test: forrest run
Change-Id: I5a9466d9ab8ce5418de0aab5739d3b6e2cabaa65
---
 .../src/com/android/server/display/LocalDisplayAdapterTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java
index 784f732ba3b14..8d6269c937644 100644
--- a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java
@@ -118,6 +118,7 @@ public class LocalDisplayAdapterTest {
         LocalServices.removeServiceForTest(LightsManager.class);
         LocalServices.addService(LightsManager.class, mMockedLightsManager);
         mInjector = new Injector();
+        when(mSurfaceControlProxy.getBootDisplayModeSupport()).thenReturn(true);
         mAdapter = new LocalDisplayAdapter(mMockedSyncRoot, mMockedContext, mHandler,
                 mListener, mInjector);
         spyOn(mAdapter);
@@ -904,7 +905,6 @@ public class LocalDisplayAdapterTest {
                 .thenReturn(display.dynamicInfo);
         when(mSurfaceControlProxy.getDesiredDisplayModeSpecs(display.token))
                 .thenReturn(display.desiredDisplayModeSpecs);
-        when(mSurfaceControlProxy.getBootDisplayModeSupport()).thenReturn(true);
     }
 
     private void updateAvailableDisplays() {