Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eaab46d authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev am: 9cb05bc5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20356992



Change-Id: I9166287d83b501b5510ce451ba584f940d8809bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f97d2d6f 9cb05bc5

src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java

+6 −4
Original line number Diff line number Diff line
@@ -96,15 +96,17 @@ public class MultiBiometricEnrollHelper { 
                // FLAG_UPDATE_CURRENT ensures it is launched with the most recent values.

                final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,

                        mActivity.getIntent());

                faceIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, mGkPwHandle);

                faceIntent.putExtra(Intent.EXTRA_USER_ID, mUserId);

                faceIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,

                        mGkPwHandle);

                final PendingIntent faceAfterFp = PendingIntent.getActivity(mActivity,

                        0 /* requestCode */, faceIntent,

                        PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);

                intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp);

            }



                BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,

                        hardwareAuthToken, mGkPwHandle, mUserId);

            }

        }));

    }

}