Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore AlternateTouchProvider for UDFPS_NEW_TOUCH_DETECTION" into tm-qpr-dev am: 80d7be59bc

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

Change-Id: If810cea4cded68878857eac5ca07cee2b8e589f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-12-08 23:59:54 +00:00
committed by Automerger Merge Worker
parent c01709b4b7 80d7be59bc
commit edb9bd0c07
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
View File

@@ -96,6 +96,7 @@ import java.util.Set;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Provider;
import kotlin.Unit; import kotlin.Unit;
@@ -714,7 +715,7 @@ public class UdfpsController implements DozeReceiver, Dumpable {
@NonNull SystemUIDialogManager dialogManager, @NonNull SystemUIDialogManager dialogManager,
@NonNull LatencyTracker latencyTracker, @NonNull LatencyTracker latencyTracker,
@NonNull ActivityLaunchAnimator activityLaunchAnimator, @NonNull ActivityLaunchAnimator activityLaunchAnimator,
@NonNull Optional<AlternateUdfpsTouchProvider> alternateTouchProvider, @NonNull Optional<Provider<AlternateUdfpsTouchProvider>> alternateTouchProvider,
@NonNull @BiometricsBackground Executor biometricsExecutor, @NonNull @BiometricsBackground Executor biometricsExecutor,
@NonNull PrimaryBouncerInteractor primaryBouncerInteractor, @NonNull PrimaryBouncerInteractor primaryBouncerInteractor,
@NonNull SinglePointerTouchProcessor singlePointerTouchProcessor) { @NonNull SinglePointerTouchProcessor singlePointerTouchProcessor) {
@@ -746,7 +747,7 @@ public class UdfpsController implements DozeReceiver, Dumpable {
mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController; mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;
mLatencyTracker = latencyTracker; mLatencyTracker = latencyTracker;
mActivityLaunchAnimator = activityLaunchAnimator; mActivityLaunchAnimator = activityLaunchAnimator;
mAlternateTouchProvider = alternateTouchProvider.orElse(null); mAlternateTouchProvider = alternateTouchProvider.map(Provider::get).orElse(null);
mSensorProps = new FingerprintSensorPropertiesInternal( mSensorProps = new FingerprintSensorPropertiesInternal(
-1 /* sensorId */, -1 /* sensorId */,
SensorProperties.STRENGTH_CONVENIENCE, SensorProperties.STRENGTH_CONVENIENCE,

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

@@ -110,6 +110,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import javax.inject.Provider;
@SmallTest @SmallTest
@RunWith(AndroidTestingRunner.class) @RunWith(AndroidTestingRunner.class)
@RunWithLooper(setAsMainLooper = true) @RunWithLooper(setAsMainLooper = true)
@@ -261,6 +263,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
initUdfpsController(true /* hasAlternateTouchProvider */); initUdfpsController(true /* hasAlternateTouchProvider */);
} }
private void initUdfpsController(boolean hasAlternateTouchProvider) { private void initUdfpsController(boolean hasAlternateTouchProvider) {
initUdfpsController(mOpticalProps, hasAlternateTouchProvider); initUdfpsController(mOpticalProps, hasAlternateTouchProvider);
} }
@@ -270,8 +273,10 @@ public class UdfpsControllerTest extends SysuiTestCase {
reset(mFingerprintManager); reset(mFingerprintManager);
reset(mScreenLifecycle); reset(mScreenLifecycle);
final Optional<AlternateUdfpsTouchProvider> alternateTouchProvider = final Optional<Provider<AlternateUdfpsTouchProvider>> alternateTouchProvider =
hasAlternateTouchProvider ? Optional.of(mAlternateTouchProvider) : Optional.empty(); hasAlternateTouchProvider ? Optional.of(
(Provider<AlternateUdfpsTouchProvider>) () -> mAlternateTouchProvider)
: Optional.empty();
mUdfpsController = new UdfpsController(mContext, new FakeExecution(), mLayoutInflater, mUdfpsController = new UdfpsController(mContext, new FakeExecution(), mLayoutInflater,
mFingerprintManager, mWindowManager, mStatusBarStateController, mFgExecutor, mFingerprintManager, mWindowManager, mStatusBarStateController, mFgExecutor,
@@ -1140,7 +1145,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
} }
@Test @Test
public void onTouch_withNewTouchDetection_shouldCallOldFingerprintManagerPath() public void onTouch_withNewTouchDetection_shouldCallNewFingerprintManagerPath()
throws RemoteException { throws RemoteException {
final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L, final NormalizedTouchData touchData = new NormalizedTouchData(0, 0f, 0f, 0f, 0f, 0f, 0L,
0L); 0L);