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

Merge "Removed warning when objects are added on wrong order." into nyc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-06-30 23:28:58 +00:00
committed by Android (Google) Code Review
parent 486c76b5ef 7709041c99
commit a98e4512df
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/util/ArraySet.java
View File

@@ -402,11 +402,14 @@ public final class ArraySet<E> implements Collection<E>, Set<E> {
throw new IllegalStateException("Array is full"); throw new IllegalStateException("Array is full");
} }
if (index > 0 && mHashes[index - 1] > hash) { if (index > 0 && mHashes[index - 1] > hash) {
// Cannot optimize since it would break the sorted order - fallback to add()
if (DEBUG) {
RuntimeException e = new RuntimeException("here"); RuntimeException e = new RuntimeException("here");
e.fillInStackTrace(); e.fillInStackTrace();
Log.w(TAG, "New hash " + hash Log.w(TAG, "New hash " + hash
+ " is before end of array hash " + mHashes[index - 1] + " is before end of array hash " + mHashes[index - 1]
+ " at index " + index, e); + " at index " + index, e);
}
add(value); add(value);
return; return;
} }