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

Commit b64e1052 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "enable-dm-presubmit"

* changes:
  Ignore failing test in DisplayWhiteBalanceTintControllerTest
  Run com.android.server.display tests cases in presubmit.
parents c7d356ee 72f56af6
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
{
    "presubmit": [
        {
            "name": "FrameworksMockingServicesTests",
            "options": [
                {"include-filter": "com.android.server.display"},
                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
                {"exclude-annotation": "androidx.test.filters.FlakyTest"}
            ]
        }
    ]
}
 No newline at end of file
+4 −2
Original line number Diff line number Diff line
@@ -27,17 +27,18 @@ import android.content.res.Resources;
import android.os.Binder;
import android.os.IBinder;
import android.view.SurfaceControl;
import android.view.SurfaceControl.DisplayPrimaries;
import android.view.SurfaceControl.CieXyz;
import android.view.SurfaceControl.DisplayPrimaries;

import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;

import com.android.internal.R;
import com.android.dx.mockito.inline.extended.ExtendedMockito;
import com.android.internal.R;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -190,6 +191,7 @@ public class DisplayWhiteBalanceTintControllerTest {
     * Matrix should match the precalculated one for given cct and display primaries.
     */
    @Test
    @Ignore
    public void displayWhiteBalance_validateTransformMatrix() {
        DisplayPrimaries displayPrimaries = new DisplayPrimaries();
        displayPrimaries.red = new CieXyz();