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

Commit 56dd059f authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Automerger Merge Worker
Browse files

Merge "ColorDisplayServiceTest fix: adding missing DisplayManagerInternal... 

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

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



Change-Id: I768d0aeb55391598e8b0749f2fdccd14f2767672
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2d72585 d600e251

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

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.Context; 
import android.content.ContextWrapper;

import android.content.res.Resources;

import android.hardware.display.ColorDisplayManager;

import android.hardware.display.DisplayManagerInternal;

import android.hardware.display.Time;

import android.os.Handler;

import android.os.UserHandle;
@@ -77,6 +78,7 @@ public class ColorDisplayServiceTest { 


    private MockTwilightManager mTwilightManager;

    private DisplayTransformManager mDisplayTransformManager;

    private DisplayManagerInternal mDisplayManagerInternal;



    private ColorDisplayService mCds;

    private ColorDisplayService.BinderService mBinderService;
@@ -116,6 +118,10 @@ public class ColorDisplayServiceTest { 
        doReturn(true).when(mDisplayTransformManager).needsLinearColorMatrix();

        LocalServices.addService(DisplayTransformManager.class, mDisplayTransformManager);



        mDisplayManagerInternal = Mockito.mock(DisplayManagerInternal.class);

        LocalServices.removeServiceForTest(DisplayManagerInternal.class);

        LocalServices.addService(DisplayManagerInternal.class, mDisplayManagerInternal);



        mCds = new ColorDisplayService(mContext);

        mBinderService = mCds.new BinderService();

        LocalServices.addService(ColorDisplayService.ColorDisplayServiceInternal.class,
@@ -142,6 +148,7 @@ public class ColorDisplayServiceTest { 
        FakeSettingsProvider.clearSettingsProvider();



        LocalServices.removeServiceForTest(ColorDisplayService.ColorDisplayServiceInternal.class);

        LocalServices.removeServiceForTest(DisplayManagerInternal.class);

    }



    @Test