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

Commit 1547a46d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix DMSTests" into main

parents fc0e80a2 685c25f2

services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java

+7 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ import android.os.SystemProperties; 
import android.os.UserManager;

import android.platform.test.flag.junit.SetFlagsRule;

import android.provider.Settings;

import android.test.mock.MockContentResolver;

import android.util.SparseArray;

import android.view.ContentRecordingSession;

import android.view.Display;
@@ -123,6 +124,8 @@ import androidx.test.filters.SmallTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.internal.R;

import com.android.internal.util.test.FakeSettingsProvider;

import com.android.internal.util.test.FakeSettingsProviderRule;

import com.android.modules.utils.testing.ExtendedMockitoRule;

import com.android.server.LocalServices;

import com.android.server.SystemService;
@@ -204,6 +207,8 @@ public class DisplayManagerServiceTest { 
    @Rule

    public SetFlagsRule mSetFlagsRule =

            new SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT);

    @Rule

    public FakeSettingsProviderRule mSettingsProviderRule = FakeSettingsProvider.rule();



    private Context mContext;
@@ -376,6 +381,8 @@ public class DisplayManagerServiceTest { 
        when(display.getBrightnessInfo()).thenReturn(mock(BrightnessInfo.class));

        mContext = spy(new ContextWrapper(

                ApplicationProvider.getApplicationContext().createDisplayContext(display)));

        final MockContentResolver resolver = mSettingsProviderRule.mockContentResolver(mContext);

        when(mContext.getContentResolver()).thenReturn(resolver);

        mResources = Mockito.spy(mContext.getResources());

        mPowerHandler = new Handler(Looper.getMainLooper());

        manageDisplaysPermission(/* granted= */ false);