1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index c4c8dc0f7ed..e4765d8ea0d 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -182,7 +182,12 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
                     EXTRA_LAUNCHED_POSTURE_GUIDANCE);
             mNextLaunched = savedInstanceState.getBoolean(EXTRA_KEY_NEXT_LAUNCHED);
         }
-        mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+        final String callingPackage = getLaunchedFromPackage();
+        if (callingPackage == null || !getPackageName().equals(callingPackage)) {
+            mUserId = UserHandle.myUserId();
+        } else {
+            mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+        }
         mPostureGuidanceIntent = FeatureFactory.getFeatureFactory()
                 .getFaceFeatureProvider().getPostureGuidanceIntent(getApplicationContext());