DeviceSettings: Fix Compiling error

- I dont know why, but "which" wanted to use integers
-Fix Cycle charging restore
Merge pull request #40 from TeamCanjica/cm-11.0

DeviceSettings: Fix Compiling error