Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f46449ab authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Gerrit Code Review
Browse files

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

parents 0a40bef9 b2e61e44

core/java/android/preference/Preference.java

+3 −0
Original line number Diff line number Diff line
@@ -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) {