From e264bf3f6682670f9faaf0b01eb9a342416dace8 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 5 Feb 2019 18:55:52 -0800 Subject: [PATCH] Retrieve effectiveUserId after userId is set/re-set Fixes: 123502937 Test: Followed steps in comment #1 of the first bug above Note that the test should be done with unified lock disabled, e.g. have separate pin/pattern/pass for owner and work profile Change-Id: I01d66a8a1d3ed1811497c2acb7db6158d99727a0 --- .../settings/password/ConfirmDeviceCredentialActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index db0935d08ab..236e3d9a936 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java @@ -157,7 +157,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction()); mUserId = UserHandle.myUserId(); - final int effectiveUserId = mUserManager.getCredentialOwnerProfile(mUserId); if (isInternalActivity()) { try { mUserId = Utils.getUserIdFromBundle(this, intent.getExtras()); @@ -165,6 +164,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { Log.e(TAG, "Invalid intent extra", se); } } + final int effectiveUserId = mUserManager.getCredentialOwnerProfile(mUserId); final boolean isManagedProfile = UserManager.get(this).isManagedProfile(mUserId); // if the client app did not hand in a title and we are about to show the work challenge, // check whether there is a policy setting the organization name and use that as title