Merge "Optimizing TimeSparseArray#put in case of collisions" into pi-dev (8f92f5f2) · Commits · e / os / android_frameworks_base

core/java/android/app/usage/TimeSparseArray.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -81,13 +81,18 @@ public class TimeSparseArray<E> extends LongSparseArray<E> {
		@Override
		public void put(long key, E value) {
		final long origKey = key;
		while (indexOfKey(key) >= 0) {
		int keyIndex = indexOfKey(key);
		if (keyIndex >= 0) {
		final long sz = size();
		while (keyIndex < sz && keyAt(keyIndex) == key) {
		key++;
		keyIndex++;
		}
		if (origKey != key) {
		if (key >= origKey + 10) {
		Slog.w(TAG, "Value " + value + " supposed to be inserted at " + origKey
		+ " displaced to " + key);
		}
		}
		super.put(key, value);
		}