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

Commit efbefbc5 authored by Christine Franks's avatar Christine Franks
Browse files

Allow color mode to be NOT_SET 

When no config_availableColorMode modes are specified, allow the
chosen mode to remain NOT_SET (-1).

Bug: 236681859
Test: atest FrameworksServicesTests:com.android.server.display.color
Change-Id: I7bd805fe44be7ef6a475bed98ecdd9926ece0a1f
parent ab56bf20

services/core/java/com/android/server/display/color/ColorDisplayService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -956,6 +956,8 @@ public final class ColorDisplayService extends SystemService { 
                        R.array.config_availableColorModes);

                        R.array.config_availableColorModes);

                if (availableColorModes.length > 0) {

                if (availableColorModes.length > 0) {

                    colorMode = availableColorModes[0];

                    colorMode = availableColorModes[0];

                } else {

                    colorMode = NOT_SET;

                }

                }

            }

            }

        }

        }

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -16,11 +16,14 @@ 




package com.android.server.display.color;

package com.android.server.display.color;





import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;

import static com.google.common.truth.Truth.assertWithMessage;





import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;
@@ -1130,6 +1133,15 @@ public class ColorDisplayServiceTest { 
                eq(ColorDisplayManager.COLOR_MODE_BOOSTED), any(), eq(Display.COLOR_MODE_INVALID));

                eq(ColorDisplayManager.COLOR_MODE_BOOSTED), any(), eq(Display.COLOR_MODE_INVALID));

    }

    }





    @Test

    public void getColorMode_noAvailableModes_returnsNotSet() {

        when(mResourcesSpy.getIntArray(R.array.config_availableColorModes))

                .thenReturn(new int[] {});

        startService();

        verify(mDisplayTransformManager, never()).setColorMode(anyInt(), any(), anyInt());

        assertThat(mBinderService.getColorMode()).isEqualTo(-1);

    }



    /**

    /**

     * Configures Night display to use a custom schedule.

     * Configures Night display to use a custom schedule.

     *

     *