Merge "Fix SuspiciousIndentation errors" into stage-aosp-master (717280b4) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+36 −30

Original line number	Diff line number	Diff line
		@@ -414,13 +414,14 @@ public class UdfpsControllerTest extends SysuiTestCase {
		final UdfpsOverlayParams oldParams = new UdfpsOverlayParams(sensorBounds[0],
		displayWidth[0], displayHeight[0], scaleFactor[0], rotation[0]);

		for (int i1 = 0; i1 <= 1; ++i1)
		for (int i2 = 0; i2 <= 1; ++i2)
		for (int i3 = 0; i3 <= 1; ++i3)
		for (int i4 = 0; i4 <= 1; ++i4)
		for (int i1 = 0; i1 <= 1; ++i1) {
		for (int i2 = 0; i2 <= 1; ++i2) {
		for (int i3 = 0; i3 <= 1; ++i3) {
		for (int i4 = 0; i4 <= 1; ++i4) {
		for (int i5 = 0; i5 <= 1; ++i5) {
		final UdfpsOverlayParams newParams = new UdfpsOverlayParams(sensorBounds[i1],
		displayWidth[i2], displayHeight[i3], scaleFactor[i4], rotation[i5]);
		final UdfpsOverlayParams newParams = new UdfpsOverlayParams(
		sensorBounds[i1], displayWidth[i2], displayHeight[i3],
		scaleFactor[i4], rotation[i5]);

		if (newParams.equals(oldParams)) {
		continue;
		@@ -431,7 +432,8 @@ public class UdfpsControllerTest extends SysuiTestCase {

		// Show the overlay.
		reset(mWindowManager);
		mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, TEST_UDFPS_SENSOR_ID,
		mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID,
		TEST_UDFPS_SENSOR_ID,
		BiometricOverlayConstants.REASON_ENROLL_ENROLLING,
		mUdfpsOverlayControllerCallback);
		mFgExecutor.runAllReady();
		@@ -447,6 +449,10 @@ public class UdfpsControllerTest extends SysuiTestCase {
		verify(mWindowManager).addView(any(), any());
		}
		}
		}
		}
		}
		}

		@Test
		public void updateOverlayParams_doesNothing_ifParamsDidntChange() throws Exception {

+4 −3

Original line number	Diff line number	Diff line
		@@ -18636,9 +18636,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		Objects.requireNonNull(strings, "strings must be provided.");

		mInjector.binderWithCleanCallingIdentity(() -> {
		if (mDeviceManagementResourcesProvider.updateStrings(strings))
		if (mDeviceManagementResourcesProvider.updateStrings(strings)) {
		sendStringsUpdatedBroadcast(
		strings.stream().map(s -> s.getStringId()).collect(Collectors.toList()));
		}
		});
		}