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

Commit a26c2d6b authored by Diya Bera's avatar Diya Bera
Browse files

Fixes crash in face enrollment during set up in work mode 

Copying extras in face intent to avoid incorrect information later in the lifecycle.

Fixes: 247049655
Test: Manual
Change-Id: I4c394a2f7b9e80d6ddc6ef385c3ab11ecf56387b
parent 2552ae08

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);

            }

        }));

    }

}