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

Commit e6fd90f4 authored by Joe Bolinger's avatar Joe Bolinger Committed by Evelyn Torres
Browse files

Drop PendingIntent extras from external packages during enrollment. 

Bug: 388528350
Flag: EXEMPT bugfix
Test: atest FingerprintEnrollIntroductionTest FaceEnrollIntroductionTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ccdeee849d5fef78498ba33cadc525523efcbd7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3f44c3b1d7a528640849b4085e0d7ca9e1e0f7dc)
Merged-In: I61281dcf95e53100a96d6a218f3f00fd1b4ea3f9
Change-Id: I61281dcf95e53100a96d6a218f3f00fd1b4ea3f9
parent 3b9e0664

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

+14 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ import com.google.android.setupdesign.span.LinkSpan; 
import com.google.android.setupdesign.template.RequireScrollMixin;

import com.google.android.setupdesign.util.DynamicColorPalette;



import java.util.List;



/**

 * Abstract base class for the intro onboarding activity for biometric enrollment.

 */
@@ -220,6 +222,18 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
                });

    }



    @Override

    protected void onStart() {

        super.onStart();



        if (!getPackageName().equals(getCallingPackage())) {

            for (String key : List.of(MultiBiometricEnrollHelper.EXTRA_SKIP_PENDING_ENROLL,

                    MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE)) {

                getIntent().removeExtra(key);

            }

        }

    }



    @Override

    protected void onResume() {

        super.onResume();