Merge "Expose SharedLibraryInfo#getAllCodePaths as @TestApi." am: 3f955dda5c (db47bd0c) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -537,6 +537,10 @@ package android.content.pm {
		field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.ProviderInfoList> CREATOR;
		}

		public final class SharedLibraryInfo implements android.os.Parcelable {
		method @NonNull public java.util.List<java.lang.String> getAllCodePaths();
		}

		public final class ShortcutInfo implements android.os.Parcelable {
		method public boolean isVisibleToPublisher();
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}