Merge "Fixed Infinite loop method call." into qt-dev

am: 6cee809841

Change-Id: I0d5bd71d683bc62c12cde41e61c9c5295569bfec

src/com/android/settings/password/SetupChooseLockGeneric.java

@@ -231,7 +231,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
 
         @Override
         protected Intent getBiometricEnrollIntent(Context context) {
-            final Intent intent = getBiometricEnrollIntent(context);
+            final Intent intent = super.getBiometricEnrollIntent(context);
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }