Merge "Fix an issue in TrackRecord." (25dffd03) · Commits · e / os / android_packages_modules_NetworkStack

tests/lib/multivariant/com/android/testutils/TrackRecord.kt

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -27,9 +27,10 @@ import kotlin.concurrent.withLock
	*/		*/
	interface TrackRecord<E> : List<E> {		interface TrackRecord<E> : List<E> {
	/**		/**
	* Adds an element to this queue, waking up threads waiting for one. Returns the element.		* Adds an element to this queue, waking up threads waiting for one. Returns true, as
			* per the contract for List.
	*/		*/
	fun add(e: E): TrackRecord<E>		fun add(e: E): Boolean

	/**		/**
	* Returns the first element after {@param pos}, possibly blocking until one is available, or		* Returns the first element after {@param pos}, possibly blocking until one is available, or
	@@ -91,12 +92,12 @@ class ArrayTrackRecord<E> : TrackRecord<E> {
	}		}

	// TrackRecord<E> implementation		// TrackRecord<E> implementation
	override fun add(e: E): ArrayTrackRecord<E> {		override fun add(e: E): Boolean {
	lock.withLock {		lock.withLock {
	elements.add(e)		elements.add(e)
	condition.signalAll()		condition.signalAll()
	}		}
	return this		return true
	}		}
	override fun poll(timeoutMs: Long, pos: Int, predicate: (E) -> Boolean) = lock.withLock {		override fun poll(timeoutMs: Long, pos: Int, predicate: (E) -> Boolean) = lock.withLock {
	elements.getOrNull(pollForIndexReadLocked(timeoutMs, pos, predicate))		elements.getOrNull(pollForIndexReadLocked(timeoutMs, pos, predicate))