Merge "Re enable remove button after cancel" into qt-dev

am: b195c402f3 Change-Id: I5e93ad399778971bdc22112982184db562306c66
2019-05-15 18:58:57 -07:00
parent 90ecaab8f8 b195c402f3
commit ecb58423a3
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
@@ -94,6 +94,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
            Log.e(TAG, "Unable to remove face: " + face.getBiometricId()
                    + " error: " + errMsgId + " " + errString);
            Toast.makeText(mContext, errString, Toast.LENGTH_SHORT).show();
+            mRemoving = false;
        }

        @Override
@@ -131,6 +132,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
                mFaceManager.remove(faces.get(0), mUserId, mRemovalCallback);
            } else {
                mButton.setEnabled(true);
+                mRemoving = false;
            }
        }
    };