release-request-36fe639f-9404-4c33-86fb-47bc4ab2221f-for-git_oc-mr1-release-41... (45fedeb6) · Commits · e / os / android_frameworks_base

api/current.txt

+341 −87

File changed.

Preview size limit exceeded, changes collapsed.

api/system-current.txt

+341 −87

File changed.

Preview size limit exceeded, changes collapsed.

api/test-current.txt

+341 −87

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/LoadedApk.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -455,6 +455,7 @@ public final class LoadedApk {
		if (!outZipPaths.contains(lib)) {
		outZipPaths.add(index, lib);
		index++;
		appendApkLibPathIfNeeded(lib, aInfo, outLibPaths);
		}
		}
		}
		@@ -463,11 +464,33 @@ public final class LoadedApk {
		for (String lib : instrumentationLibs) {
		if (!outZipPaths.contains(lib)) {
		outZipPaths.add(0, lib);
		appendApkLibPathIfNeeded(lib, aInfo, outLibPaths);
		}
		}
		}
		}

		/**
		* This method appends a path to the appropriate native library folder of a
		* library if this library is hosted in an APK. This allows support for native
		* shared libraries. The library API is determined based on the application
		* ABI.
		*
		* @param path Path to the library.
		* @param applicationInfo The application depending on the library.
		* @param outLibPaths List to which to add the native lib path if needed.
		*/
		private static void appendApkLibPathIfNeeded(@NonNull String path,
		@NonNull ApplicationInfo applicationInfo, @Nullable List<String> outLibPaths) {
		// Looking at the suffix is a little hacky but a safe and simple solution.
		// We will be revisiting code in the next release and clean this up.
		if (outLibPaths != null && applicationInfo.primaryCpuAbi != null && path.endsWith(".apk")) {
		if (applicationInfo.targetSdkVersion >= Build.VERSION_CODES.O) {
		outLibPaths.add(path + "!/lib/" + applicationInfo.primaryCpuAbi);
		}
		}
		}

		/*
		* All indices received by the super class should be shifted by 1 when accessing mSplitNames,
		* etc. The super class assumes the base APK is index 0, while the PackageManager APIs don't

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -6009,6 +6009,10 @@ public class PackageParser {
		}
		}

		public boolean isLibrary() {
		return staticSharedLibName != null \|\| !ArrayUtils.isEmpty(libraryNames);
		}

		public List<String> getAllCodePaths() {
		ArrayList<String> paths = new ArrayList<>();
		paths.add(baseCodePath);