Merge "Fix errorprone warnings that should be errors" am: 523b6d9b79 am: 31f9dd89b6

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

Change-Id: I5077433bd273dc559f864e570b8f858035ac8993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-20 02:38:49 +00:00
committed by Automerger Merge Worker

View File

@@ -102,7 +102,8 @@ public class Face10Test {
FaceSensorProperties.TYPE_UNKNOWN, supportsFaceDetection, supportsSelfIllumination, FaceSensorProperties.TYPE_UNKNOWN, supportsFaceDetection, supportsSelfIllumination,
resetLockoutRequiresChallenge); resetLockoutRequiresChallenge);
Face10.sSystemClock = Clock.fixed(Instant.ofEpochMilli(100), ZoneId.of("PST")); Face10.sSystemClock = Clock.fixed(
Instant.ofEpochMilli(100), ZoneId.of("America/Los_Angeles"));
mFace10 = new Face10(mContext, sensorProps, mLockoutResetDispatcher, mHandler, mScheduler, mFace10 = new Face10(mContext, sensorProps, mLockoutResetDispatcher, mHandler, mScheduler,
mBiometricContext); mBiometricContext);
mBinder = new Binder(); mBinder = new Binder();
@@ -112,7 +113,7 @@ public class Face10Test {
waitForIdle(); waitForIdle();
Face10.sSystemClock = Clock.fixed(Instant.ofEpochSecond( Face10.sSystemClock = Clock.fixed(Instant.ofEpochSecond(
Face10.sSystemClock.instant().getEpochSecond() + seconds), Face10.sSystemClock.instant().getEpochSecond() + seconds),
ZoneId.of("PST")); ZoneId.of("America/Los_Angeles"));
} }
@Test @Test