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

Commit cc3ee412 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add test coverage for android.hardware.lights.LightsRequest and hide... 

Merge "Add test coverage for android.hardware.lights.LightsRequest and hide android.hardware.lights.LightsManager.LightsSession constructor." into sc-dev am: 5dbfd93d

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

Change-Id: I803e3c80011004e48d5fc87a8ca5df1f19967dde
parents 4cb1c548 5dbfd93d

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -18991,7 +18991,6 @@ package android.hardware.lights { 
  }















  public abstract static class LightsManager.LightsSession implements java.lang.AutoCloseable {













    ctor public LightsManager.LightsSession();















    method public abstract void close();















    method public abstract void requestLights(@NonNull android.hardware.lights.LightsRequest);















  }

























core/java/android/hardware/lights/LightsManager.java



+6
−0






























Original line number
Diff line number
Diff line








@@ -112,6 +112,12 @@ public abstract class LightsManager {













    public abstract static class LightsSession implements AutoCloseable {















        private final IBinder mToken = new Binder();





























        /**













         * @hide to prevent subclassing from outside of the framework













         */













        public LightsSession() {













        }





























        /**















         * Sends a request to modify the states of multiple lights.















         *

































core/tests/coretests/src/android/hardware/input/InputDeviceLightsManagerTest.java



+22
−0






























Original line number
Diff line number
Diff line








@@ -33,6 +33,7 @@ import static org.mockito.Mockito.when;













import android.hardware.lights.Light;















import android.hardware.lights.LightState;















import android.hardware.lights.LightsManager;













import android.hardware.lights.LightsRequest;















import android.os.IBinder;















import android.platform.test.annotations.Presubmit;















import android.util.ArrayMap;










@@ -224,4 +225,25 @@ public class InputDeviceLightsManagerTest {













        session.close();















        verify(mIInputManagerMock).closeLightSession(eq(DEVICE_ID), eq(token));















    }



























    @Test













    public void testLightsRequest() throws Exception {













        Light light = new Light(1 /* id */, 0 /* ordinal */,  Light.LIGHT_TYPE_INPUT_PLAYER_ID);













        LightState state = new LightState(0xf1);













        LightsRequest request = new Builder().addLight(light, state).build();



























        // Covers the LightsRequest.getLights













        assertThat(request.getLights().size()).isEqualTo(1);













        assertThat(request.getLights().get(0)).isEqualTo(1);



























        // Covers the LightsRequest.getLightStates













        assertThat(request.getLightStates().size()).isEqualTo(1);













        assertThat(request.getLightStates().get(0)).isEqualTo(state);



























        // Covers the LightsRequest.getLightsAndStates













        assertThat(request.getLightsAndStates().size()).isEqualTo(1);













        assertThat(request.getLightsAndStates().containsKey(1)).isTrue();













        assertThat(request.getLightsAndStates().get(1)).isEqualTo(state);













    }





























}