Merge changes from topic "res_loader_dir" into rvc-dev am: b0544a733c am:... (15869daf) · 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

File changed.

Preview size limit exceeded, changes collapsed.