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

Commit 7f2a0136 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments 

Some invocations of ChooseLockGeneric are done with arguments, but
when invoking it from FingerprintEnrollIntroduction we add the extra
to the activity intent so we need to support both.

Bug: 26901625
Change-Id: Iaabad18bf17160578f6b6d807dc6acfead1ba419
parent 71966850

src/com/android/settings/ChooseLockGeneric.java

+3 −1
Original line number Diff line number Diff line
@@ -180,7 +180,9 @@ public class ChooseLockGeneric extends SettingsActivity { 
                    !mLockPatternUtils.isSeparateProfileChallengeAllowed(targetUser)) {

                // Always use parent if explicitely requested or if profile challenge is not

                // supported

                mUserId = Utils.getUserIdFromBundle(getContext(), getArguments());

                Bundle arguments = getArguments();

                mUserId = Utils.getUserIdFromBundle(getContext(), arguments != null ? arguments

                        : getActivity().getIntent().getExtras());

            } else {

                mUserId = targetUser;

            }