Merge "Inject more dependencies into PackageManagerService" (6c6a4c12) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageAbiHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ public interface PackageAbiHelper {
		* If {@code extractLibs} is true, native libraries are extracted from the app if required.
		*/
		Pair<Abis, NativeLibraryPaths> derivePackageAbi(AndroidPackage pkg, boolean isUpdatedSystemApp,
		String cpuAbiOverride) throws PackageManagerException;
		String cpuAbiOverride, File appLib32InstallDir) throws PackageManagerException;

		/**
		* Calculates adjusted ABIs for a set of packages belonging to a shared user so that they all

+3 −3

Original line number	Diff line number	Diff line
		@@ -296,7 +296,7 @@ final class PackageAbiHelperImpl implements PackageAbiHelper {

		@Override
		public Pair<Abis, NativeLibraryPaths> derivePackageAbi(AndroidPackage pkg,
		boolean isUpdatedSystemApp, String cpuAbiOverride)
		boolean isUpdatedSystemApp, String cpuAbiOverride, File appLib32InstallDir)
		throws PackageManagerException {
		// Give ourselves some initial paths; we'll come back for another
		// pass once we've determined ABI below.
		@@ -304,7 +304,7 @@ final class PackageAbiHelperImpl implements PackageAbiHelper {
		String pkgRawSecondaryCpuAbi = AndroidPackageUtils.getRawSecondaryCpuAbi(pkg);
		final NativeLibraryPaths initialLibraryPaths = deriveNativeLibraryPaths(
		new Abis(pkgRawPrimaryCpuAbi, pkgRawSecondaryCpuAbi),
		PackageManagerService.sAppLib32InstallDir, pkg.getPath(),
		appLib32InstallDir, pkg.getPath(),
		pkg.getBaseApkPath(), pkg.isSystem(),
		isUpdatedSystemApp);

		@@ -452,7 +452,7 @@ final class PackageAbiHelperImpl implements PackageAbiHelper {

		final Abis abis = new Abis(primaryCpuAbi, secondaryCpuAbi);
		return new Pair<>(abis,
		deriveNativeLibraryPaths(abis, PackageManagerService.sAppLib32InstallDir,
		deriveNativeLibraryPaths(abis, appLib32InstallDir,
		pkg.getPath(), pkg.getBaseApkPath(), pkg.isSystem(),
		isUpdatedSystemApp));
		}

+368 −304

File changed.

Preview size limit exceeded, changes collapsed.

+10 −1

Original line number	Diff line number	Diff line
		@@ -475,6 +475,14 @@ public final class Settings {
		return mPackages.get(pkgName);
		}

		ArrayMap<String, PackageSetting> getPackagesLocked() {
		return mPackages;
		}

		KeySetManagerService getKeySetManagerService() {
		return mKeySetManagerService;
		}

		String getRenamedPackageLPr(String pkgName) {
		return mRenamedPackages.get(pkgName);
		}
		@@ -5553,7 +5561,8 @@ public final class Settings {
		return mPreferredActivities.get(userId);
		}

		CrossProfileIntentResolver getCrossProfileIntentResolvers(int userId) {
		@Nullable
		CrossProfileIntentResolver getCrossProfileIntentResolver(int userId) {
		return mCrossProfileIntentResolvers.get(userId);
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,14 @@
		}
		]
		},
		{
		"name": "FrameworksMockingServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.pm."
		}
		]
		},
		{
		"name": "CtsContentTestCases",
		"options": [