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

Commit 1bcce22a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Drop PendingIntent extras from external packages during enrollment."... 

Merge "Drop PendingIntent extras from external packages during enrollment." into tm-dev am: 8b6eb6f8

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



Change-Id: I88ce0e94432a67b96a86aa8703be210374148803
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3ce0a7b 8b6eb6f8

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.

 */
@@ -224,6 +226,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();