am 505232be: Merge "Fix of Settings application sort crash"

# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '505232be07e388c602529e14254df013637b16f2':
  Fix of Settings application sort crash

src/com/android/settings/fuelgauge/BatterySipper.java

@@ -93,7 +93,7 @@ class BatterySipper implements Comparable<BatterySipper> {
 
     public int compareTo(BatterySipper other) {
         // Return the flipped value because we want the items in descending order
-        return (int) (other.getSortValue() - getSortValue());
+        return Double.compare(other.getSortValue(), getSortValue());
     }
 
     void getQuickNameIconForUid(Uid uidObj) {