Merge changes Ia0623d38,Iaabd5d8b,I579bb12f,Ia9930edd (e9e84a1d) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/IPackageManager.aidl

+1 −9

Original line number	Diff line number	Diff line
		@@ -507,14 +507,6 @@ interface IPackageManager {
		oneway void registerDexModule(in String packageName, in String dexModulePath,
		in boolean isSharedModule, IDexModuleRegisterCallback callback);

		/**
		* Ask the package manager to perform a dex-opt for the given reason. The package
		* manager will map the reason to a compiler filter according to the current system
		* configuration.
		*/
		boolean performDexOpt(String packageName, boolean checkProfiles,
		int compileReason, boolean force, boolean bootComplete, boolean downgrade);

		/**
		* Ask the package manager to perform a dex-opt with the given compiler filter.
		*
		@@ -522,7 +514,7 @@ interface IPackageManager {
		* definite state.
		*/
		boolean performDexOptMode(String packageName, boolean checkProfiles,
		String targetCompilerFilter, boolean force, boolean bootComplete);
		String targetCompilerFilter, boolean force, boolean bootComplete, String splitName);

		/**
		* Ask the package manager to perform a dex-opt with the given compiler filter on the

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

+14 −15

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.util.Log;
		import com.android.server.pm.dex.DexManager;
		import com.android.server.LocalServices;
		import com.android.server.PinnerService;
		import com.android.server.pm.dex.DexoptOptions;

		import java.io.File;
		import java.util.Set;
		@@ -217,12 +218,10 @@ public class BackgroundDexOptService extends JobService {
		// Unfortunately this will also means that "pm.dexopt.boot=speed-profile" will
		// behave differently than "pm.dexopt.bg-dexopt=speed-profile" but that's a
		// trade-off worth doing to save boot time work.
		int result = pm.performDexOptWithStatus(pkg,
		/* checkProfiles */ false,
		int result = pm.performDexOptWithStatus(new DexoptOptions(
		pkg,
		PackageManagerService.REASON_BOOT,
		/* force */ false,
		/* bootComplete */ true,
		/* downgrade */ false);
		DexoptOptions.DEXOPT_BOOT_COMPLETE));
		if (result == PackageDexOptimizer.DEX_OPT_PERFORMED) {
		updatedPackages.add(pkg);
		}
		@@ -334,22 +333,22 @@ public class BackgroundDexOptService extends JobService {
		// Optimize package if needed. Note that there can be no race between
		// concurrent jobs because PackageDexOptimizer.performDexOpt is synchronized.
		boolean success;
		int dexoptFlags =
		DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES \|
		DexoptOptions.DEXOPT_BOOT_COMPLETE \|
		(downgrade ? DexoptOptions.DEXOPT_DOWNGRADE : 0);
		if (is_for_primary_dex) {
		int result = pm.performDexOptWithStatus(pkg,
		/* checkProfiles */ true,
		reason,
		false /* forceCompile*/,
		true /* bootComplete */,
		downgrade);
		int result = pm.performDexOptWithStatus(new DexoptOptions(pkg,
		PackageManagerService.REASON_BACKGROUND_DEXOPT,
		dexoptFlags));
		success = result != PackageDexOptimizer.DEX_OPT_FAILED;
		if (result == PackageDexOptimizer.DEX_OPT_PERFORMED) {
		updatedPackages.add(pkg);
		}
		} else {
		success = pm.performDexOptSecondary(pkg,
		reason,
		false /* force */,
		downgrade);
		success = pm.performDexOpt(new DexoptOptions(pkg,
		PackageManagerService.REASON_BACKGROUND_DEXOPT,
		dexoptFlags \| DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX));
		}
		if (success) {
		// Dexopt succeeded, remove package from the list of failing ones.

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

+11 −11

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.server.pm;

		import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;
		import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;
		import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;

		import android.annotation.Nullable;
		import android.content.Context;
		@@ -35,6 +34,7 @@ import android.util.Slog;

		import com.android.internal.logging.MetricsLogger;
		import com.android.server.pm.Installer.InstallerException;
		import com.android.server.pm.dex.DexoptOptions;

		import java.io.File;
		import java.io.FileDescriptor;
		@@ -314,19 +314,19 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
		libraryDependencies = NO_LIBRARIES;
		}


		optimizer.performDexOpt(pkg, libraryDependencies,
		null /* ISAs /, false / checkProfiles */,
		getCompilerFilterForReason(compilationReason),
		null /* ISAs */,
		null /* CompilerStats.PackageStats */,
		mPackageManagerService.getDexManager().isUsedByOtherApps(pkg.packageName),
		true /* bootComplete */,
		false /* downgrade */);

		mPackageManagerService.getDexManager().dexoptSecondaryDex(pkg.packageName,
		getCompilerFilterForReason(compilationReason),
		false /* force */,
		false /* compileOnlySharedDex */,
		false /* downgrade */);
		new DexoptOptions(pkg.packageName, compilationReason,
		DexoptOptions.DEXOPT_BOOT_COMPLETE));

		mPackageManagerService.getDexManager().dexoptSecondaryDex(
		new DexoptOptions(pkg.packageName, compilationReason,
		DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX \|
		DexoptOptions.DEXOPT_BOOT_COMPLETE));

		return commands;
		}

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

+27 −108

Original line number	Diff line number	Diff line
		@@ -19,9 +19,7 @@ package com.android.server.pm;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageParser;
		import android.os.Environment;
		import android.os.FileUtils;
		import android.os.PowerManager;
		import android.os.SystemClock;
		@@ -30,11 +28,12 @@ import android.os.UserHandle;
		import android.os.WorkSource;
		import android.util.Log;
		import android.util.Slog;
		import android.util.SparseArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.server.pm.Installer.InstallerException;
		import com.android.server.pm.dex.DexoptOptions;
		import com.android.server.pm.dex.DexoptUtils;

		import java.io.File;
		import java.io.IOException;
		@@ -123,18 +122,16 @@ public class PackageDexOptimizer {
		* synchronized on {@link #mInstallLock}.
		*/
		int performDexOpt(PackageParser.Package pkg, String[] sharedLibraries,
		String[] instructionSets, boolean checkProfiles, String targetCompilationFilter,
		CompilerStats.PackageStats packageStats, boolean isUsedByOtherApps,
		boolean bootComplete, boolean downgrade) {
		String[] instructionSets, CompilerStats.PackageStats packageStats,
		boolean isUsedByOtherApps, DexoptOptions options) {
		if (!canOptimizePackage(pkg)) {
		return DEX_OPT_SKIPPED;
		}
		synchronized (mInstallLock) {
		final long acquireTime = acquireWakeLockLI(pkg.applicationInfo.uid);
		try {
		return performDexOptLI(pkg, sharedLibraries, instructionSets, checkProfiles,
		targetCompilationFilter, packageStats, isUsedByOtherApps, bootComplete,
		downgrade);
		return performDexOptLI(pkg, sharedLibraries, instructionSets,
		packageStats, isUsedByOtherApps, options);
		} finally {
		releaseWakeLockLI(acquireTime);
		}
		@@ -147,9 +144,8 @@ public class PackageDexOptimizer {
		*/
		@GuardedBy("mInstallLock")
		private int performDexOptLI(PackageParser.Package pkg, String[] sharedLibraries,
		String[] targetInstructionSets, boolean checkForProfileUpdates,
		String targetCompilerFilter, CompilerStats.PackageStats packageStats,
		boolean isUsedByOtherApps, boolean bootComplete, boolean downgrade) {
		String[] targetInstructionSets, CompilerStats.PackageStats packageStats,
		boolean isUsedByOtherApps, DexoptOptions options) {
		final String[] instructionSets = targetInstructionSets != null ?
		targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo);
		final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);
		@@ -157,16 +153,18 @@ public class PackageDexOptimizer {
		final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);

		final String compilerFilter = getRealCompilerFilter(pkg.applicationInfo,
		targetCompilerFilter, isUsedByOtherApps);
		final boolean profileUpdated = checkForProfileUpdates &&
		options.getCompilerFilter(), isUsedByOtherApps);
		final boolean profileUpdated = options.isCheckForProfileUpdates() &&
		isProfileUpdated(pkg, sharedGid, compilerFilter);

		final String sharedLibrariesPath = getSharedLibrariesPath(sharedLibraries);
		// Get the dexopt flags after getRealCompilerFilter to make sure we get the correct flags.
		final int dexoptFlags = getDexFlags(pkg, compilerFilter, bootComplete);
		// Get the dependencies of each split in the package. For each code path in the package,
		// this array contains the relative paths of each split it depends on, separated by colons.
		String[] splitDependencies = getSplitDependencies(pkg);
		final int dexoptFlags = getDexFlags(pkg, compilerFilter, options.isBootComplete());

		// Get the class loader context dependencies.
		// For each code path in the package, this array contains the class loader context that
		// needs to be passed to dexopt in order to ensure correct optimizations.
		String[] classLoaderContexts = DexoptUtils.getClassLoaderContexts(
		pkg.applicationInfo, sharedLibraries);

		int result = DEX_OPT_SKIPPED;
		for (int i = 0; i < paths.size(); i++) {
		@@ -177,17 +175,18 @@ public class PackageDexOptimizer {
		}
		// Append shared libraries with split dependencies for this split.
		String path = paths.get(i);
		String sharedLibrariesPathWithSplits;
		if (sharedLibrariesPath != null && splitDependencies[i] != null) {
		sharedLibrariesPathWithSplits = sharedLibrariesPath + ":" + splitDependencies[i];
		} else {
		sharedLibrariesPathWithSplits =
		splitDependencies[i] != null ? splitDependencies[i] : sharedLibrariesPath;
		if (options.getSplitName() != null) {
		// We are asked to compile only a specific split. Check that the current path is
		// what we are looking for.
		if (!options.getSplitName().equals(new File(path).getName())) {
		continue;
		}
		}

		for (String dexCodeIsa : dexCodeInstructionSets) {
		int newResult = dexOptPath(pkg, path, dexCodeIsa, compilerFilter, profileUpdated,
		sharedLibrariesPathWithSplits, dexoptFlags, sharedGid, packageStats,
		downgrade);
		int newResult = dexOptPath(pkg, path, dexCodeIsa, compilerFilter,
		profileUpdated, classLoaderContexts[i], dexoptFlags, sharedGid,
		packageStats, options.isDowngrade());
		// The end result is:
		// - FAILED if any path failed,
		// - PERFORMED if at least one path needed compilation,
		@@ -455,86 +454,6 @@ public class PackageDexOptimizer {
		return adjustDexoptNeeded(dexoptNeeded);
		}

		/**
		* Computes the shared libraries path that should be passed to dexopt.
		*/
		private String getSharedLibrariesPath(String[] sharedLibraries) {
		if (sharedLibraries == null \|\| sharedLibraries.length == 0) {
		return null;
		}
		StringBuilder sb = new StringBuilder();
		for (String lib : sharedLibraries) {
		if (sb.length() != 0) {
		sb.append(":");
		}
		sb.append(lib);
		}
		return sb.toString();
		}

		/**
		* Walks dependency tree and gathers the dependencies for each split in a split apk.
		* The split paths are stored as relative paths, separated by colons.
		*/
		private String[] getSplitDependencies(PackageParser.Package pkg) {
		// Convert all the code paths to relative paths.
		String baseCodePath = new File(pkg.baseCodePath).getParent();
		List<String> paths = pkg.getAllCodePaths();
		String[] splitDependencies = new String[paths.size()];
		for (int i = 0; i < paths.size(); i++) {
		File pathFile = new File(paths.get(i));
		String fileName = pathFile.getName();
		paths.set(i, fileName);

		// Sanity check that the base paths of the splits are all the same.
		String basePath = pathFile.getParent();
		if (!basePath.equals(baseCodePath)) {
		Slog.wtf(TAG, "Split paths have different base paths: " + basePath + " and " +
		baseCodePath);
		}
		}

		// If there are no other dependencies, fill in the implicit dependency on the base apk.
		SparseArray<int[]> dependencies = pkg.applicationInfo.splitDependencies;
		if (dependencies == null) {
		for (int i = 1; i < paths.size(); i++) {
		splitDependencies[i] = paths.get(0);
		}
		return splitDependencies;
		}

		// Fill in the dependencies, skipping the base apk which has no dependencies.
		for (int i = 1; i < dependencies.size(); i++) {
		getParentDependencies(dependencies.keyAt(i), paths, dependencies, splitDependencies);
		}

		return splitDependencies;
		}

		/**
		* Recursive method to generate dependencies for a particular split.
		* The index is a key from the package's splitDependencies.
		*/
		private String getParentDependencies(int index, List<String> paths,
		SparseArray<int[]> dependencies, String[] splitDependencies) {
		// The base apk is always first, and has no dependencies.
		if (index == 0) {
		return null;
		}
		// Return the result if we've computed the dependencies for this index already.
		if (splitDependencies[index] != null) {
		return splitDependencies[index];
		}
		// Get the dependencies for the parent of this index and append its path to it.
		int parent = dependencies.get(index)[0];
		String parentDependencies =
		getParentDependencies(parent, paths, dependencies, splitDependencies);
		String path = parentDependencies == null ? paths.get(parent) :
		parentDependencies + ":" + paths.get(parent);
		splitDependencies[index] = path;
		return path;
		}

		/**
		* Checks if there is an update on the profile information of the {@code pkg}.
		* If the compiler filter is not profile guided the method returns false.

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

+76 −86

File changed.

Preview size limit exceeded, changes collapsed.