Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"

aosp-mirror · Oct 7, 2015 · f518ad0 · f518ad0
2 parents f8ac5c3 + 6689c90
commit f518ad0
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/core/java/android/preference/PreferenceGroup.java b/core/java/android/preference/PreferenceGroup.java
@@ -148,16 +148,15 @@ public boolean addPreference(Preference preference) {
             }
         }
 
-        int insertionIndex = Collections.binarySearch(mPreferenceList, preference);
-        if (insertionIndex < 0) {
-            insertionIndex = insertionIndex * -1 - 1;
-        }
-
         if (!onPrepareAddPreference(preference)) {
             return false;
         }
 
         synchronized(this) {
+            int insertionIndex = Collections.binarySearch(mPreferenceList, preference);
+            if (insertionIndex < 0) {
+                insertionIndex = insertionIndex * -1 - 1;
+            }
             mPreferenceList.add(insertionIndex, preference);
         }