Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"

Browse Source 
* commit 'f518ad0a4941236b72b5d090320d4ab70ebbf26b':
  IndexOutOfBoundsException on addPreference in PreferenceGroup
This commit is contained in:
Alan Viverette
2015-10-07 16:54:26 +00:00
committed by Android Git Automerger
parent 2235ecd5ec f518ad0a49
commit b46886f41d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/preference/PreferenceGroup.java
View File

@@ -148,16 +148,15 @@ public abstract class PreferenceGroup extends Preference implements GenericInfla
} }
} }
int insertionIndex = Collections.binarySearch(mPreferenceList, preference);
if (insertionIndex < 0) {
insertionIndex = insertionIndex * -1 - 1;
}
if (!onPrepareAddPreference(preference)) { if (!onPrepareAddPreference(preference)) {
return false; return false;
} }
synchronized(this) { synchronized(this) {
int insertionIndex = Collections.binarySearch(mPreferenceList, preference);
if (insertionIndex < 0) {
insertionIndex = insertionIndex * -1 - 1;
}
mPreferenceList.add(insertionIndex, preference); mPreferenceList.add(insertionIndex, preference);
} }