commit 7430932305c028088987e72c1ad8e8ac84728de9
author Eric Sandness <sandness@google.com> Sun Mar 15 18:10:55 2020 +0000
committer Eric Sandness <sandness@google.com> Tue Mar 17 17:16:08 2020 +0000
tree a8a37d9852009a1bbf480254f906bca4433b5be3
parent f9b7313545f9d24a825503b85c3eae985b10b986

Use ChooseLockGeneric When Started By Admin App

The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity.  If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric.  Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.

Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f