Merge changes from topic "res_loader_dir" into rvc-dev am: b0544a733c (c5f968d5) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −12

Original line number	Diff line number	Diff line
		@@ -12872,14 +12872,7 @@ package android.content.res {
		package android.content.res.loader {

		public interface AssetsProvider {
		method @Nullable public default java.io.InputStream loadAsset(@NonNull String, int) throws java.io.IOException;
		method @Nullable public default android.os.ParcelFileDescriptor loadAssetParcelFd(@NonNull String) throws java.io.IOException;
		}

		public class DirectoryAssetsProvider implements android.content.res.loader.AssetsProvider {
		ctor public DirectoryAssetsProvider(@NonNull java.io.File);
		method @Nullable public java.io.File findFile(@NonNull String);
		method @NonNull public java.io.File getDirectory();
		method @Nullable public default android.content.res.AssetFileDescriptor loadAssetFd(@NonNull String, int);
		}

		public class ResourcesLoader {
		@@ -12894,14 +12887,11 @@ package android.content.res.loader {
		public class ResourcesProvider implements java.lang.AutoCloseable java.io.Closeable {
		method public void close();
		method @NonNull public static android.content.res.loader.ResourcesProvider empty(@NonNull android.content.res.loader.AssetsProvider);
		method @Nullable public android.content.res.loader.AssetsProvider getAssetsProvider();
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.ParcelFileDescriptor) throws java.io.IOException;
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.ParcelFileDescriptor, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.SharedMemory) throws java.io.IOException;
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.SharedMemory, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromDirectory(@NonNull String, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromSplit(@NonNull android.content.Context, @NonNull String) throws java.io.IOException;
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromTable(@NonNull android.os.ParcelFileDescriptor, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;
		method @NonNull public static android.content.res.loader.ResourcesProvider loadFromTable(@NonNull android.os.SharedMemory, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;
		}

		}

core/java/android/app/ResourcesManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -346,10 +346,9 @@ public class ResourcesManager {

		// We must load this from disk.
		if (overlay) {
		apkAssets = ApkAssets.loadOverlayFromPath(overlayPathToIdmapPath(path),
		false /system/);
		apkAssets = ApkAssets.loadOverlayFromPath(overlayPathToIdmapPath(path), 0 /flags/);
		} else {
		apkAssets = ApkAssets.loadFromPath(path, false /system/, sharedLib);
		apkAssets = ApkAssets.loadFromPath(path, sharedLib ? ApkAssets.PROPERTY_DYNAMIC : 0);
		}

		if (mLoadedApkAssets != null) {
		@@ -1256,7 +1255,8 @@ public class ResourcesManager {
		* instance uses.
		*/
		@Override
		public void onLoadersChanged(Resources resources, List<ResourcesLoader> newLoader) {
		public void onLoadersChanged(@NonNull Resources resources,
		@NonNull List<ResourcesLoader> newLoader) {
		synchronized (ResourcesManager.this) {
		final ResourcesKey oldKey = findKeyForResourceImplLocked(resources.getImpl());
		if (oldKey == null) {
		@@ -1284,7 +1284,7 @@ public class ResourcesManager {
		* {@code loader} to apply any changes of the set of {@link ApkAssets}.
		**/
		@Override
		public void onLoaderUpdated(ResourcesLoader loader) {
		public void onLoaderUpdated(@NonNull ResourcesLoader loader) {
		synchronized (ResourcesManager.this) {
		final ArrayMap<ResourcesImpl, ResourcesKey> updatedResourceImplKeys =
		new ArrayMap<>();

core/java/android/content/pm/PackageParser.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1443,7 +1443,7 @@ public class PackageParser {
		try {
		try {
		apkAssets = fd != null
		? ApkAssets.loadFromFd(fd, debugPathName, false, false)
		? ApkAssets.loadFromFd(fd, debugPathName, 0 /* flags /, null / assets */)
		: ApkAssets.loadFromPath(apkPath);
		} catch (IOException e) {
		throw new PackageParserException(INSTALL_PARSE_FAILED_NOT_APK,

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ public class ApkLiteParseUtils {
		try {
		try {
		apkAssets = fd != null
		? ApkAssets.loadFromFd(fd, debugPathName, false, false)
		? ApkAssets.loadFromFd(fd, debugPathName, 0 /* flags /, null / assets */)
		: ApkAssets.loadFromPath(apkPath);
		} catch (IOException e) {
		throw new PackageParser.PackageParserException(

core/java/android/content/res/ApkAssets.java

+203 −83

Original line number	Diff line number	Diff line
		@@ -15,17 +15,20 @@
		*/
		package android.content.res;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.om.OverlayableInfo;
		import android.content.res.loader.AssetsProvider;
		import android.content.res.loader.ResourcesProvider;
		import android.text.TextUtils;

		import com.android.internal.annotations.GuardedBy;

		import java.io.FileDescriptor;
		import java.io.IOException;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Objects;

		/**
		@@ -39,14 +42,79 @@ import java.util.Objects;
		* @hide
		*/
		public final class ApkAssets {
		@GuardedBy("this") private final long mNativePtr;

		/**
		* The apk assets contains framework resource values specified by the system.
		* This allows some functions to filter out this package when computing what
		* configurations/resources are available.
		*/
		public static final int PROPERTY_SYSTEM = 1 << 0;

		/**
		* The apk assets is a shared library or was loaded as a shared library by force.
		* The package ids of dynamic apk assets are assigned at runtime instead of compile time.
		*/
		public static final int PROPERTY_DYNAMIC = 1 << 1;

		/**
		* The apk assets has been loaded dynamically using a {@link ResourcesProvider}.
		* Loader apk assets overlay resources like RROs except they are not backed by an idmap.
		*/
		public static final int PROPERTY_LOADER = 1 << 2;

		/**
		* The apk assets is a RRO.
		* An RRO overlays resource values of its target package.
		*/
		private static final int PROPERTY_OVERLAY = 1 << 3;

		/** Flags that change the behavior of loaded apk assets. */
		@IntDef(prefix = { "PROPERTY_" }, value = {
		PROPERTY_SYSTEM,
		PROPERTY_DYNAMIC,
		PROPERTY_LOADER,
		PROPERTY_OVERLAY,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface PropertyFlags {}

		/** The path used to load the apk assets represents an APK file. */
		private static final int FORMAT_APK = 0;

		/** The path used to load the apk assets represents an idmap file. */
		private static final int FORMAT_IDMAP = 1;

		/** The path used to load the apk assets represents an resources.arsc file. */
		private static final int FORMAT_ARSC = 2;

		/** the path used to load the apk assets represents a directory. */
		private static final int FORMAT_DIR = 3;

		// Format types that change how the apk assets are loaded.
		@IntDef(prefix = { "FORMAT_" }, value = {
		FORMAT_APK,
		FORMAT_IDMAP,
		FORMAT_ARSC,
		FORMAT_DIR
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface FormatType {}

		@GuardedBy("this")
		private final long mNativePtr;

		@Nullable
		@GuardedBy("this") private final StringBlock mStringBlock;
		@GuardedBy("this")
		private final StringBlock mStringBlock;

		@GuardedBy("this") private boolean mOpen = true;
		@GuardedBy("this")
		private boolean mOpen = true;

		private final boolean mForLoader;
		@PropertyFlags
		private final int mFlags;

		@Nullable
		private final AssetsProvider mAssets;

		/**
		* Creates a new ApkAssets instance from the given path on disk.
		@@ -56,157 +124,202 @@ public final class ApkAssets {
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadFromPath(@NonNull String path) throws IOException {
		return new ApkAssets(path, false /system/, false /forceSharedLib/, false /overlay/,
		false /arscOnly/, false /forLoader/);
		return loadFromPath(path, 0 /* flags */);
		}

		/**
		* Creates a new ApkAssets instance from the given path on disk.
		*
		* @param path The path to an APK on disk.
		* @param system When true, the APK is loaded as a system APK (framework).
		* @param flags flags that change the behavior of loaded apk assets
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadFromPath(@NonNull String path, boolean system)
		public static @NonNull ApkAssets loadFromPath(@NonNull String path, @PropertyFlags int flags)
		throws IOException {
		return new ApkAssets(path, system, false /forceSharedLib/, false /overlay/,
		false /arscOnly/, false /forLoader/);
		return new ApkAssets(FORMAT_APK, path, flags, null /* assets */);
		}

		/**
		* Creates a new ApkAssets instance from the given path on disk.
		*
		* @param path The path to an APK on disk.
		* @param system When true, the APK is loaded as a system APK (framework).
		* @param forceSharedLibrary When true, any packages within the APK with package ID 0x7f are
		* loaded as a shared library.
		* @param flags flags that change the behavior of loaded apk assets
		* @param assets The assets provider that overrides the loading of file-based resources
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadFromPath(@NonNull String path, boolean system,
		boolean forceSharedLibrary) throws IOException {
		return new ApkAssets(path, system, forceSharedLibrary, false /overlay/,
		false /arscOnly/, false /forLoader/);
		public static @NonNull ApkAssets loadFromPath(@NonNull String path, @PropertyFlags int flags,
		@Nullable AssetsProvider assets) throws IOException {
		return new ApkAssets(FORMAT_APK, path, flags, assets);
		}

		/**
		* Creates a new ApkAssets instance from the given file descriptor. Not for use by applications.
		* Creates a new ApkAssets instance from the given file descriptor.
		*
		* Performs a dup of the underlying fd, so you must take care of still closing
		* the FileDescriptor yourself (and can do that whenever you want).
		*
		* @param fd The FileDescriptor of an open, readable APK.
		* @param friendlyName The friendly name used to identify this ApkAssets when logging.
		* @param system When true, the APK is loaded as a system APK (framework).
		* @param forceSharedLibrary When true, any packages within the APK with package ID 0x7f are
		* loaded as a shared library.
		* @param flags flags that change the behavior of loaded apk assets
		* @param assets The assets provider that overrides the loading of file-based resources
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadFromFd(@NonNull FileDescriptor fd,
		@NonNull String friendlyName, boolean system, boolean forceSharedLibrary)
		throws IOException {
		return new ApkAssets(fd, friendlyName, system, forceSharedLibrary, false /arscOnly/,
		false /forLoader/);
		@NonNull String friendlyName, @PropertyFlags int flags,
		@Nullable AssetsProvider assets) throws IOException {
		return new ApkAssets(FORMAT_APK, fd, friendlyName, flags, assets);
		}

		/**
		* Creates a new ApkAssets instance from the IDMAP at idmapPath. The overlay APK path
		* is encoded within the IDMAP.
		* Creates a new ApkAssets instance from the given file descriptor.
		*
		* @param idmapPath Path to the IDMAP of an overlay APK.
		* @param system When true, the APK is loaded as a system APK (framework).
		* Performs a dup of the underlying fd, so you must take care of still closing
		* the FileDescriptor yourself (and can do that whenever you want).
		*
		* @param fd The FileDescriptor of an open, readable APK.
		* @param friendlyName The friendly name used to identify this ApkAssets when logging.
		* @param offset The location within the file that the apk starts. This must be 0 if length is
		* {@link AssetFileDescriptor#UNKNOWN_LENGTH}.
		* @param length The number of bytes of the apk, or {@link AssetFileDescriptor#UNKNOWN_LENGTH}
		* if it extends to the end of the file.
		* @param flags flags that change the behavior of loaded apk assets
		* @param assets The assets provider that overrides the loading of file-based resources
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadOverlayFromPath(@NonNull String idmapPath, boolean system)
		public static @NonNull ApkAssets loadFromFd(@NonNull FileDescriptor fd,
		@NonNull String friendlyName, long offset, long length, @PropertyFlags int flags,
		@Nullable AssetsProvider assets)
		throws IOException {
		return new ApkAssets(idmapPath, system, false /forceSharedLibrary/, true /overlay/,
		false /arscOnly/, false /forLoader/);
		return new ApkAssets(FORMAT_APK, fd, friendlyName, offset, length, flags, assets);
		}

		/**
		* Creates a new ApkAssets instance from the given path on disk for use with a
		* {@link ResourcesProvider}.
		* Creates a new ApkAssets instance from the IDMAP at idmapPath. The overlay APK path
		* is encoded within the IDMAP.
		*
		* @param path The path to an APK on disk.
		* @param idmapPath Path to the IDMAP of an overlay APK.
		* @param flags flags that change the behavior of loaded apk assets
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadApkForLoader(@NonNull String path)
		throws IOException {
		return new ApkAssets(path, false /system/, false /forceSharedLibrary/,
		false /overlay/, false /arscOnly/, true /forLoader/);
		public static @NonNull ApkAssets loadOverlayFromPath(@NonNull String idmapPath,
		@PropertyFlags int flags) throws IOException {
		return new ApkAssets(FORMAT_IDMAP, idmapPath, flags, null /* assets */);
		}

		/**
		* Creates a new ApkAssets instance from the given file descriptor for use with a
		* {@link ResourcesProvider}.
		* Creates a new ApkAssets instance from the given file descriptor representing a resources.arsc
		* for use with a {@link ResourcesProvider}.
		*
		* Performs a dup of the underlying fd, so you must take care of still closing
		* the FileDescriptor yourself (and can do that whenever you want).
		*
		* @param fd The FileDescriptor of an open, readable APK.
		* @param fd The FileDescriptor of an open, readable resources.arsc.
		* @param friendlyName The friendly name used to identify this ApkAssets when logging.
		* @param flags flags that change the behavior of loaded apk assets
		* @param assets The assets provider that overrides the loading of file-based resources
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		@NonNull
		public static ApkAssets loadApkForLoader(@NonNull FileDescriptor fd) throws IOException {
		return new ApkAssets(fd, TextUtils.emptyIfNull(fd.toString()),
		false /system/, false /forceSharedLib/, false /arscOnly/, true /forLoader/);
		public static @NonNull ApkAssets loadTableFromFd(@NonNull FileDescriptor fd,
		@NonNull String friendlyName, @PropertyFlags int flags,
		@Nullable AssetsProvider assets) throws IOException {
		return new ApkAssets(FORMAT_ARSC, fd, friendlyName, flags, assets);
		}

		/**
		* Creates a new ApkAssets instance from the given file descriptor representing an ARSC
		* Creates a new ApkAssets instance from the given file descriptor representing a resources.arsc
		* for use with a {@link ResourcesProvider}.
		*
		* Performs a dup of the underlying fd, so you must take care of still closing
		* the FileDescriptor yourself (and can do that whenever you want).
		*
		* @param fd The FileDescriptor of an open, readable .arsc.
		* @param fd The FileDescriptor of an open, readable resources.arsc.
		* @param friendlyName The friendly name used to identify this ApkAssets when logging.
		* @param offset The location within the file that the table starts. This must be 0 if length is
		* {@link AssetFileDescriptor#UNKNOWN_LENGTH}.
		* @param length The number of bytes of the table, or {@link AssetFileDescriptor#UNKNOWN_LENGTH}
		* if it extends to the end of the file.
		* @param flags flags that change the behavior of loaded apk assets
		* @param assets The assets provider that overrides the loading of file-based resources
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadTableFromFd(@NonNull FileDescriptor fd,
		@NonNull String friendlyName, long offset, long length, @PropertyFlags int flags,
		@Nullable AssetsProvider assets) throws IOException {
		return new ApkAssets(FORMAT_ARSC, fd, friendlyName, offset, length, flags, assets);
		}

		/**
		* Creates a new ApkAssets instance from the given directory path. The directory should have the
		* file structure of an APK.
		*
		* @param path The path to a directory on disk.
		* @param flags flags that change the behavior of loaded apk assets
		* @param assets The assets provider that overrides the loading of file-based resources
		* @return a new instance of ApkAssets.
		* @throws IOException if a disk I/O error or parsing error occurred.
		*/
		public static @NonNull ApkAssets loadArscForLoader(@NonNull FileDescriptor fd)
		throws IOException {
		return new ApkAssets(fd, TextUtils.emptyIfNull(fd.toString()),
		false /system/, false /forceSharedLib/, true /arscOnly/, true /forLoader/);
		public static @NonNull ApkAssets loadFromDir(@NonNull String path,
		@PropertyFlags int flags, @Nullable AssetsProvider assets) throws IOException {
		return new ApkAssets(FORMAT_DIR, path, flags, assets);
		}

		/**
		* Generates an entirely empty ApkAssets. Needed because the ApkAssets instance and presence
		* is required for a lot of APIs, and it's easier to have a non-null reference rather than
		* tracking a separate identifier.
		*
		* @param flags flags that change the behavior of loaded apk assets
		* @param assets The assets provider that overrides the loading of file-based resources
		*/
		@NonNull
		public static ApkAssets loadEmptyForLoader() {
		return new ApkAssets(true);
		public static ApkAssets loadEmptyForLoader(@PropertyFlags int flags,
		@Nullable AssetsProvider assets) {
		return new ApkAssets(flags, assets);
		}

		private ApkAssets(boolean forLoader) {
		mForLoader = forLoader;
		mNativePtr = nativeLoadEmpty(forLoader);
		mStringBlock = null;
		private ApkAssets(@FormatType int format, @NonNull String path, @PropertyFlags int flags,
		@Nullable AssetsProvider assets) throws IOException {
		Objects.requireNonNull(path, "path");
		mFlags = flags;
		mNativePtr = nativeLoad(format, path, flags, assets);
		mStringBlock = new StringBlock(nativeGetStringBlock(mNativePtr), true /useSparse/);
		mAssets = assets;
		}

		private ApkAssets(@NonNull String path, boolean system, boolean forceSharedLib, boolean overlay,
		boolean arscOnly, boolean forLoader) throws IOException {
		mForLoader = forLoader;
		Objects.requireNonNull(path, "path");
		mNativePtr = arscOnly ? nativeLoadArsc(path, forLoader)
		: nativeLoad(path, system, forceSharedLib, overlay, forLoader);
		private ApkAssets(@FormatType int format, @NonNull FileDescriptor fd,
		@NonNull String friendlyName, @PropertyFlags int flags, @Nullable AssetsProvider assets)
		throws IOException {
		Objects.requireNonNull(fd, "fd");
		Objects.requireNonNull(friendlyName, "friendlyName");
		mFlags = flags;
		mNativePtr = nativeLoadFd(format, fd, friendlyName, flags, assets);
		mStringBlock = new StringBlock(nativeGetStringBlock(mNativePtr), true /useSparse/);
		mAssets = assets;
		}

		private ApkAssets(@NonNull FileDescriptor fd, @NonNull String friendlyName, boolean system,
		boolean forceSharedLib, boolean arscOnly, boolean forLoader) throws IOException {
		mForLoader = forLoader;
		private ApkAssets(@FormatType int format, @NonNull FileDescriptor fd,
		@NonNull String friendlyName, long offset, long length, @PropertyFlags int flags,
		@Nullable AssetsProvider assets) throws IOException {
		Objects.requireNonNull(fd, "fd");
		Objects.requireNonNull(friendlyName, "friendlyName");
		mNativePtr = arscOnly ? nativeLoadArscFromFd(fd, friendlyName, forLoader)
		: nativeLoadFromFd(fd, friendlyName, system, forceSharedLib, forLoader);
		mFlags = flags;
		mNativePtr = nativeLoadFdOffsets(format, fd, friendlyName, offset, length, flags, assets);
		mStringBlock = new StringBlock(nativeGetStringBlock(mNativePtr), true /useSparse/);
		mAssets = assets;
		}

		private ApkAssets(@PropertyFlags int flags, @Nullable AssetsProvider assets) {
		mFlags = flags;
		mNativePtr = nativeLoadEmpty(flags, assets);
		mStringBlock = null;
		mAssets = assets;
		}

		@UnsupportedAppUsage
		@@ -226,8 +339,17 @@ public final class ApkAssets {
		}
		}

		/** Returns whether this apk assets was loaded using a {@link ResourcesProvider}. */
		public boolean isForLoader() {
		return mForLoader;
		return (mFlags & PROPERTY_LOADER) != 0;
		}

		/**
		* Returns the assets provider that overrides the loading of assets present in this apk assets.
		*/
		@Nullable
		public AssetsProvider getAssetsProvider() {
		return mAssets;
		}

		/**
		@@ -300,18 +422,16 @@ public final class ApkAssets {
		}
		}

		private static native long nativeLoad(@NonNull String path, boolean system,
		boolean forceSharedLib, boolean overlay, boolean forLoader)
		throws IOException;
		private static native long nativeLoadFromFd(@NonNull FileDescriptor fd,
		@NonNull String friendlyName, boolean system, boolean forceSharedLib,
		boolean forLoader)
		throws IOException;
		private static native long nativeLoadArsc(@NonNull String path, boolean forLoader)
		throws IOException;
		private static native long nativeLoadArscFromFd(@NonNull FileDescriptor fd,
		@NonNull String friendlyName, boolean forLoader) throws IOException;
		private static native long nativeLoadEmpty(boolean forLoader);
		private static native long nativeLoad(@FormatType int format, @NonNull String path,
		@PropertyFlags int flags, @Nullable AssetsProvider asset) throws IOException;
		private static native long nativeLoadEmpty(@PropertyFlags int flags,
		@Nullable AssetsProvider asset);
		private static native long nativeLoadFd(@FormatType int format, @NonNull FileDescriptor fd,
		@NonNull String friendlyName, @PropertyFlags int flags,
		@Nullable AssetsProvider asset) throws IOException;
		private static native long nativeLoadFdOffsets(@FormatType int format,
		@NonNull FileDescriptor fd, @NonNull String friendlyName, long offset, long length,
		@PropertyFlags int flags, @Nullable AssetsProvider asset) throws IOException;
		private static native void nativeDestroy(long ptr);
		private static native @NonNull String nativeGetAssetPath(long ptr);
		private static native long nativeGetStringBlock(long ptr);