From 7f2a013619fee267c1d4d6b0cc352444eef2de07 Mon Sep 17 00:00:00 2001
From: Clara Bayarri <clarabayarri@google.com>
Date: Fri, 5 Feb 2016 17:37:02 +0000
Subject: [PATCH] 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
---
 src/com/android/settings/ChooseLockGeneric.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index c2b76e19f54..434fe154fb6 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -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;
             }