Merge "Add LongSparseArray.removeIf(Predicate)." (9244b380) · Commits · e / os / android_frameworks_base

core/java/android/util/LongSparseArray.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -16,15 +16,18 @@

		package android.util;

		import android.annotation.NonNull;
		import android.os.Parcel;

		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.GrowingArrayUtils;
		import com.android.internal.util.Preconditions;
		import com.android.internal.util.function.LongObjPredicate;

		import libcore.util.EmptyArray;

		import java.util.Arrays;
		import java.util.Objects;

		/**
		* SparseArray mapping longs to Objects. Unlike a normal array of Objects,
		@@ -145,6 +148,18 @@ public class LongSparseArray<E> implements Cloneable {
		delete(key);
		}

		/** @hide */
		@SuppressWarnings("unchecked")
		public void removeIf(@NonNull LongObjPredicate<? super E> filter) {
		Objects.requireNonNull(filter);
		for (int i = 0; i < mSize; ++i) {
		if (mValues[i] != DELETED && filter.test(mKeys[i], (E) mValues[i])) {
		mValues[i] = DELETED;
		mGarbage = true;
		}
		}
		}

		/**
		* Removes the mapping at the specified index.
		*

core/java/com/android/internal/util/function/LongObjPredicate.java

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.internal.util.function;

		/**
		* Represents a predicate (boolean-valued function) of a {@code long}-valued argument
		* and an object-valued argument.
		*
		* @param <T> the type of the object-valued argument to the predicate
		*/
		@FunctionalInterface
		public interface LongObjPredicate<T> {
		/**
		* Evaluates this predicate on the given arguments.
		*
		* @param value the first input argument
		* @param t the second input argument
		* @return {@code true} if the input arguments match the predicate,
		* otherwise {@code false}
		*/
		boolean test(long value, T t);
		}

core/tests/coretests/src/android/util/LongSparseArrayTest.java

0 → 100644

+54 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.util;

		import static com.google.common.truth.Truth.assertThat;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;

		import com.android.internal.util.function.LongObjPredicate;

		import org.junit.Test;
		import org.junit.runner.RunWith;

		/**
		* Tests for {@link LongSparseArray}.
		*/
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class LongSparseArrayTest {
		@Test
		public void testRemoveIf() {
		final LongSparseArray<Integer> sparseArray = new LongSparseArray();
		for (int i = 0; i < 10; ++i) {
		for (int j = 100; j < 110; ++j) {
		sparseArray.put(i, j);
		sparseArray.put(-i, j);
		sparseArray.put(j, -i);
		sparseArray.put(-j, -i);
		}
		}

		final LongObjPredicate<Integer> predicate = (value, obj) -> (value < 0 && obj < 0);
		sparseArray.removeIf(predicate);

		for (int i = 0; i < sparseArray.size(); ++i) {
		assertThat(predicate.test(sparseArray.keyAt(i), sparseArray.valueAt(i)))
		.isFalse();
		}
		}
		}