Merge "Fix lint warnings" into main (f2518c83) · Commits · e / os / android_frameworks_base

core/java/android/hardware/devicestate/DeviceState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ public final class DeviceState {
		* primary display area.
		*
		* Note: This does not necessarily mean that the outer display area is the
		* @link Display#DEFAULT_DISPLAY}.
		* {@link Display#DEFAULT_DISPLAY}.
		*/
		public static final int PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY = 11;

+6 −10

Original line number	Diff line number	Diff line
		@@ -57,19 +57,15 @@ public final class DeviceStateTest {

		@Test
		public void testConstruct_tooLargeIdentifier() {
		assertThrows(IllegalArgumentException.class, () -> {
		final DeviceState state = new DeviceState(
		MAXIMUM_DEVICE_STATE_IDENTIFIER + 1 /* identifier */,
		null /* name /, 0 / flags */);
		});
		assertThrows(IllegalArgumentException.class,
		() -> new DeviceState(MAXIMUM_DEVICE_STATE_IDENTIFIER + 1 /* identifier */,
		null /* name /, 0 / flags */));
		}

		@Test
		public void testConstruct_tooSmallIdentifier() {
		assertThrows(IllegalArgumentException.class, () -> {
		final DeviceState state = new DeviceState(
		MINIMUM_DEVICE_STATE_IDENTIFIER - 1 /* identifier */,
		null /* name /, 0 / flags */);
		});
		assertThrows(IllegalArgumentException.class,
		() -> new DeviceState(MINIMUM_DEVICE_STATE_IDENTIFIER - 1 /* identifier */,
		null /* name /, 0 / flags */));
		}
		}