Merge "Update settings together with frameworks/base"

src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java

@@ -103,8 +103,8 @@ public class FingerprintAuthenticateSidecar extends InstrumentedFragment {
 
     public void startAuthentication(int userId) {
         mCancellationSignal = new CancellationSignal();
-        mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */,
-                mAuthenticationCallback, null, userId);
+        mFingerprintManager.authenticate(null /* crypto */, mCancellationSignal,
+                mAuthenticationCallback, null /* handler */, userId);
     }
 
     public void stopAuthentication() {

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java

@@ -40,8 +40,7 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
     @Override
     protected void startEnrollment() {
         super.startEnrollment();
-        mFingerprintManager.enroll(mToken, mEnrollmentCancel,
-                0 /* flags */, mUserId, mEnrollmentCallback);
+        mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback);
     }
 
     private FingerprintManager.EnrollmentCallback mEnrollmentCallback

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java

@@ -93,7 +93,6 @@ public class FingerprintEnrollEnrollingTest {
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                anyInt(),
                 callbackCaptor.capture());
 
         return callbackCaptor.getValue();

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java

@@ -151,7 +151,6 @@ public class FingerprintEnrollFindSensorTest {
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                anyInt(),
                 callbackCaptor.capture());
 
         return callbackCaptor.getValue();