Merge "Fixed Infinite loop method call." into qt-dev am: 6cee809841

am: c397945810

Change-Id: I3f3183284cfd6ae6f147e6c1495196c485a52976

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;
         }