Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

2013-05-26 06:59:29 +00:00
parent 0a40bef955 b2e61e44e9
commit f46449abed
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) {