summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorsatayev <satayev@google.com>2021-05-11 17:26:47 +0100
committersatayev <satayev@google.com>2021-05-11 17:26:47 +0100
commita8e4e5dcc330c18109f8f628dda2a34f067bbc89 (patch)
treefc14c70abebb2695bc813900942f3d8985db39a6 /core/java
parent7283a692b07b8e7ad7ad906b86038a3e18f29e43 (diff)
Expose SharedLibraryInfo#getAllCodePaths as @TestApi.
The method is called by CTS helper app to list all java shared libraries present on the device. All classes present in the reported jar/apk files are then collected by a CTS/GTS EDI collector. Bug: 187823488 Test: m Change-Id: I750065112d70bc3ab45c8b6c6cc8aa4d429488a8
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/SharedLibraryInfo.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/content/pm/SharedLibraryInfo.java b/core/java/android/content/pm/SharedLibraryInfo.java
index da2a3d885fc6..933a0c9ba341 100644
--- a/core/java/android/content/pm/SharedLibraryInfo.java
+++ b/core/java/android/content/pm/SharedLibraryInfo.java
@@ -20,6 +20,7 @@ import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.TestApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -29,6 +30,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
/**
* This class provides information for a shared library. There are
@@ -177,7 +179,8 @@ public final class SharedLibraryInfo implements Parcelable {
*
* @hide
*/
- public List<String> getAllCodePaths() {
+ @TestApi
+ public @NonNull List<String> getAllCodePaths() {
if (getPath() != null) {
// Builtin library.
ArrayList<String> list = new ArrayList<>();
@@ -185,7 +188,7 @@ public final class SharedLibraryInfo implements Parcelable {
return list;
} else {
// Static or dynamic library.
- return mCodePaths;
+ return Objects.requireNonNull(mCodePaths);
}
}