am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup" (b46886f4) · Commits · e / os / android_frameworks_base

core/java/android/preference/PreferenceGroup.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -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)) {
		return false;
		}

		synchronized(this) {
		int insertionIndex = Collections.binarySearch(mPreferenceList, preference);
		if (insertionIndex < 0) {
		insertionIndex = insertionIndex * -1 - 1;
		}
		mPreferenceList.add(insertionIndex, preference);
		}