Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ColorDisplayServiceTest fix: adding missing DisplayManagerInternal service" into udc-dev

Browse Source
This commit is contained in:
Oleg Petšjonkin
2023-03-02 16:30:05 +00:00
committed by Android (Google) Code Review
parent 58112a38d6 5344b7010a
commit d600e251a9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/tests/servicestests/src/com/android/server/display/color/ColorDisplayServiceTest.java
View File

@@ -34,6 +34,7 @@ import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.res.Resources; import android.content.res.Resources;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.hardware.display.DisplayManagerInternal;
import android.hardware.display.Time; import android.hardware.display.Time;
import android.os.Handler; import android.os.Handler;
import android.os.UserHandle; import android.os.UserHandle;
@@ -77,6 +78,7 @@ public class ColorDisplayServiceTest {
private MockTwilightManager mTwilightManager; private MockTwilightManager mTwilightManager;
private DisplayTransformManager mDisplayTransformManager; private DisplayTransformManager mDisplayTransformManager;
private DisplayManagerInternal mDisplayManagerInternal;
private ColorDisplayService mCds; private ColorDisplayService mCds;
private ColorDisplayService.BinderService mBinderService; private ColorDisplayService.BinderService mBinderService;
@@ -116,6 +118,10 @@ public class ColorDisplayServiceTest {
doReturn(true).when(mDisplayTransformManager).needsLinearColorMatrix(); doReturn(true).when(mDisplayTransformManager).needsLinearColorMatrix();
LocalServices.addService(DisplayTransformManager.class, mDisplayTransformManager); LocalServices.addService(DisplayTransformManager.class, mDisplayTransformManager);
mDisplayManagerInternal = Mockito.mock(DisplayManagerInternal.class);
LocalServices.removeServiceForTest(DisplayManagerInternal.class);
LocalServices.addService(DisplayManagerInternal.class, mDisplayManagerInternal);
mCds = new ColorDisplayService(mContext); mCds = new ColorDisplayService(mContext);
mBinderService = mCds.new BinderService(); mBinderService = mCds.new BinderService();
LocalServices.addService(ColorDisplayService.ColorDisplayServiceInternal.class, LocalServices.addService(ColorDisplayService.ColorDisplayServiceInternal.class,
@@ -142,6 +148,7 @@ public class ColorDisplayServiceTest {
FakeSettingsProvider.clearSettingsProvider(); FakeSettingsProvider.clearSettingsProvider();
LocalServices.removeServiceForTest(ColorDisplayService.ColorDisplayServiceInternal.class); LocalServices.removeServiceForTest(ColorDisplayService.ColorDisplayServiceInternal.class);
LocalServices.removeServiceForTest(DisplayManagerInternal.class);
} }
@Test @Test