Merge "Cancel current operation when binder dies"

    @Override

    @Override

    public void binderDied() {

    public void binderDied() {

        // If the current client dies we should cancel the current operation.

        Slog.e(getLogTag(), "Binder died, cancelling client");

        try {

            getDaemonWrapper().cancel();

        } catch (RemoteException e) {

            Slog.e(getLogTag(), "Remote exception", e);

        }

        mToken = null;

        mToken = null;

        mListener = null;

        mListener = null;

        onError(getHalDeviceId(), BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE,

                0 /* vendorCode */);

    }

    }

    @Override

    @Override