am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

* commit '43861f9de965593340f6a63c270120a7f1a8701c': Avoid IllegalArgumentException in Preference.java compareTo()
2013-05-26 00:05:08 -07:00
parent 4e73e8a817 43861f9de9
commit 23b07d5549
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -1072,6 +1072,9 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
                || (mOrder == DEFAULT_ORDER && another.mOrder != DEFAULT_ORDER)) {
            // Do order comparison
            return mOrder - another.mOrder; 
+        } else if (mTitle == another.mTitle) {
+            // If titles are null or share same object comparison
+            return 0;
        } else if (mTitle == null) {
            return 1;
        } else if (another.mTitle == null) {