From a26ae90b4dfe9397aafa7ab15a4b3cd887ca7585 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Thu, 14 Nov 2019 14:59:57 -0800 Subject: Extract SparseArrayMap from QuotaController. This structure can be useful in other parts of the system, so extracting it and making it more generic makes sense. Bug: 135764360 Bug: 141645789 Test: atest QuotaControllerTest Test: atest SparseArrayMapTest Change-Id: I2aeb3ea53e3dc2ec00667a0a2ccdb112cf562377 --- core/java/android/util/SparseArray.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'core/java/android/util/SparseArray.java') diff --git a/core/java/android/util/SparseArray.java b/core/java/android/util/SparseArray.java index 0a15db227823..484894f98023 100644 --- a/core/java/android/util/SparseArray.java +++ b/core/java/android/util/SparseArray.java @@ -103,6 +103,14 @@ public class SparseArray implements Cloneable { return clone; } + /** + * Returns true if the key exists in the array. This is equivalent to + * {@link #indexOfKey(int)} >= 0. + */ + public boolean contains(int key) { + return indexOfKey(key) >= 0; + } + /** * Gets the Object mapped from the specified key, or null * if no such mapping has been made. -- cgit v1.2.3 From ed1cfed835b9e66e6c1268ac529be20ee6459def Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Mon, 25 Nov 2019 09:53:51 -0800 Subject: Address API feedback. Add @param and @return to new SparseArray.contains() method. Bug: N/A Test: N/A Change-Id: I81460524f29628a4ce1e47b1510c2887fa51717d --- core/java/android/util/SparseArray.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core/java/android/util/SparseArray.java') diff --git a/core/java/android/util/SparseArray.java b/core/java/android/util/SparseArray.java index 484894f98023..d3367c10bff5 100644 --- a/core/java/android/util/SparseArray.java +++ b/core/java/android/util/SparseArray.java @@ -106,6 +106,9 @@ public class SparseArray implements Cloneable { /** * Returns true if the key exists in the array. This is equivalent to * {@link #indexOfKey(int)} >= 0. + * + * @param key Potential key in the mapping + * @return true if the key is defined in the mapping */ public boolean contains(int key) { return indexOfKey(key) >= 0; -- cgit v1.2.3 From df4395991fa9d59d77268e10d935ee81a67f2c80 Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Tue, 10 Dec 2019 17:47:53 +0000 Subject: Use new UnsupportedAppUsage annotation. Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I288969b0c22fa3a63bc2e71bb5009fe4a927e154 --- core/java/android/util/SparseArray.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android/util/SparseArray.java') diff --git a/core/java/android/util/SparseArray.java b/core/java/android/util/SparseArray.java index d3367c10bff5..dae760f989f6 100644 --- a/core/java/android/util/SparseArray.java +++ b/core/java/android/util/SparseArray.java @@ -16,7 +16,7 @@ package android.util; -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import com.android.internal.util.ArrayUtils; import com.android.internal.util.GrowingArrayUtils; -- cgit v1.2.3