A new report out of Korea suggest Samsung's SDI will be producing solid state batteries for their flagship phones by 2019. The advantage of a solid state battery is that it includes solid electrolytes instead of liquid making the battery less volatile and less likely to catch fire. The tech is not mature enough to produce now but is expected to be within the next two years.
via Korea Herald