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

# By Jia Arlan
# Via Android Git Automerger (1) and others
* commit 'bbf8daf4602b62d806c4946196b526edbe08e056':
  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) {