diff options
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java | 66 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 7 |
2 files changed, 40 insertions, 33 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java index 946c52e8ee5b..21b8baf85369 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java @@ -414,37 +414,43 @@ 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 i5 = 0; i5 <= 1; ++i5) { - final UdfpsOverlayParams newParams = new UdfpsOverlayParams(sensorBounds[i1], - displayWidth[i2], displayHeight[i3], scaleFactor[i4], rotation[i5]); - - if (newParams.equals(oldParams)) { - continue; + 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]); + + if (newParams.equals(oldParams)) { + continue; + } + + // Initialize the overlay with old parameters. + mUdfpsController.updateOverlayParams(TEST_UDFPS_SENSOR_ID, oldParams); + + // Show the overlay. + reset(mWindowManager); + mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, + TEST_UDFPS_SENSOR_ID, + BiometricOverlayConstants.REASON_ENROLL_ENROLLING, + mUdfpsOverlayControllerCallback); + mFgExecutor.runAllReady(); + verify(mWindowManager).addView(any(), any()); + + // Update overlay parameters. + reset(mWindowManager); + mUdfpsController.updateOverlayParams(TEST_UDFPS_SENSOR_ID, newParams); + mFgExecutor.runAllReady(); + + // Ensure the overlay was recreated. + verify(mWindowManager).removeView(any()); + verify(mWindowManager).addView(any(), any()); + } + } + } } - - // Initialize the overlay with old parameters. - mUdfpsController.updateOverlayParams(TEST_UDFPS_SENSOR_ID, oldParams); - - // Show the overlay. - reset(mWindowManager); - mOverlayController.showUdfpsOverlay(TEST_REQUEST_ID, TEST_UDFPS_SENSOR_ID, - BiometricOverlayConstants.REASON_ENROLL_ENROLLING, - mUdfpsOverlayControllerCallback); - mFgExecutor.runAllReady(); - verify(mWindowManager).addView(any(), any()); - - // Update overlay parameters. - reset(mWindowManager); - mUdfpsController.updateOverlayParams(TEST_UDFPS_SENSOR_ID, newParams); - mFgExecutor.runAllReady(); - - // Ensure the overlay was recreated. - verify(mWindowManager).removeView(any()); - verify(mWindowManager).addView(any(), any()); } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 9d708add5ca5..7895f708a5ca 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -18636,9 +18636,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Objects.requireNonNull(strings, "strings must be provided."); mInjector.binderWithCleanCallingIdentity(() -> { - if (mDeviceManagementResourcesProvider.updateStrings(strings)) - sendStringsUpdatedBroadcast( - strings.stream().map(s -> s.getStringId()).collect(Collectors.toList())); + if (mDeviceManagementResourcesProvider.updateStrings(strings)) { + sendStringsUpdatedBroadcast( + strings.stream().map(s -> s.getStringId()).collect(Collectors.toList())); + } }); } |