Did I misunderstand the term "fan service" all along?

[b00moscone]

Personally, I believe it means when something is done for the sake of pleasing fans and such, as you said. But it also spills into your second definition.

So i'd say you weren't mistaken by the definition, but perhaps didn't see the big picture of it.