Merge changes from topic "bgdex2oatd_cherry_pick" (e686fabf) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -336,7 +336,8 @@ public class BackgroundDexOptService extends JobService {
		int dexoptFlags =
		DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES \|
		DexoptOptions.DEXOPT_BOOT_COMPLETE \|
		(downgrade ? DexoptOptions.DEXOPT_DOWNGRADE : 0);
		(downgrade ? DexoptOptions.DEXOPT_DOWNGRADE : 0) \|
		DexoptOptions.DEXOPT_IDLE_BACKGROUND_JOB;
		if (is_for_primary_dex) {
		int result = pm.performDexOptWithStatus(new DexoptOptions(pkg,
		PackageManagerService.REASON_BACKGROUND_DEXOPT,

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,8 @@ public class Installer extends SystemService {
		public static final int DEXOPT_STORAGE_CE = 1 << 7;
		/** Indicates that the dex file passed to dexopt in on DE storage. */
		public static final int DEXOPT_STORAGE_DE = 1 << 8;
		/** Indicates that dexopt is invoked from the background service. */
		public static final int DEXOPT_IDLE_BACKGROUND_JOB = 1 << 9;

		// NOTE: keep in sync with installd
		public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8;

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

+54 −15

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import java.io.File;
		import java.io.IOException;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Map;

		import dalvik.system.DexFile;

		@@ -52,6 +53,7 @@ import static com.android.server.pm.Installer.DEXOPT_SECONDARY_DEX;
		import static com.android.server.pm.Installer.DEXOPT_FORCE;
		import static com.android.server.pm.Installer.DEXOPT_STORAGE_CE;
		import static com.android.server.pm.Installer.DEXOPT_STORAGE_DE;
		import static com.android.server.pm.Installer.DEXOPT_IDLE_BACKGROUND_JOB;
		import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;
		import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;

		@@ -392,24 +394,58 @@ public class PackageDexOptimizer {
		/**
		* Dumps the dexopt state of the given package {@code pkg} to the given {@code PrintWriter}.
		*/
		void dumpDexoptState(IndentingPrintWriter pw, PackageParser.Package pkg) {
		void dumpDexoptState(IndentingPrintWriter pw, PackageParser.Package pkg,
		PackageDexUsage.PackageUseInfo useInfo) {
		final String[] instructionSets = getAppDexInstructionSets(pkg.applicationInfo);
		final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);

		final List<String> paths = pkg.getAllCodePathsExcludingResourceOnly();

		for (String instructionSet : dexCodeInstructionSets) {
		pw.println("Instruction Set: " + instructionSet);
		pw.increaseIndent();
		for (String path : paths) {
		pw.println("path: " + path);
		pw.increaseIndent();

		for (String isa : dexCodeInstructionSets) {
		String status = null;
		try {
		status = DexFile.getDexFileStatus(path, instructionSet);
		status = DexFile.getDexFileStatus(path, isa);
		} catch (IOException ioe) {
		status = "[Exception]: " + ioe.getMessage();
		}
		pw.println("path: " + path);
		pw.println("status: " + status);
		pw.println(isa + ": " + status);
		}

		if (useInfo.isUsedByOtherApps(path)) {
		pw.println("used be other apps: " + useInfo.getLoadingPackages(path));
		}

		Map<String, PackageDexUsage.DexUseInfo> dexUseInfoMap = useInfo.getDexUseInfoMap();

		if (!dexUseInfoMap.isEmpty()) {
		pw.println("known secondary dex files:");
		pw.increaseIndent();
		for (Map.Entry<String, PackageDexUsage.DexUseInfo> e : dexUseInfoMap.entrySet()) {
		String dex = e.getKey();
		PackageDexUsage.DexUseInfo dexUseInfo = e.getValue();
		pw.println(dex);
		pw.increaseIndent();
		for (String isa : dexUseInfo.getLoaderIsas()) {
		String status = null;
		try {
		status = DexFile.getDexFileStatus(path, isa);
		} catch (IOException ioe) {
		status = "[Exception]: " + ioe.getMessage();
		}
		pw.println(isa + ": " + status);
		}

		pw.println("class loader context: " + dexUseInfo.getClassLoaderContext());
		if (dexUseInfo.isUsedByOtherApps()) {
		pw.println("used be other apps: " + dexUseInfo.getLoadingPackages());
		}
		pw.decreaseIndent();
		}
		pw.decreaseIndent();
		}
		pw.decreaseIndent();
		}
		@@ -568,6 +604,9 @@ public class PackageDexOptimizer {
		if ((flags & DEXOPT_STORAGE_DE) == DEXOPT_STORAGE_DE) {
		flagsList.add("storage_de");
		}
		if ((flags & DEXOPT_IDLE_BACKGROUND_JOB) == DEXOPT_IDLE_BACKGROUND_JOB) {
		flagsList.add("idle_background_job");
		}

		return String.join(",", flagsList);
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -22555,7 +22555,8 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		for (PackageParser.Package pkg : packages) {
		ipw.println("[" + pkg.packageName + "]");
		ipw.increaseIndent();
		mPackageDexOptimizer.dumpDexoptState(ipw, pkg);
		mPackageDexOptimizer.dumpDexoptState(ipw, pkg,
		mDexManager.getPackageUseInfoOrDefault(pkg.packageName));
		ipw.decreaseIndent();
		}
		}

services/core/java/com/android/server/pm/dex/DexoptOptions.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,9 @@ public final class DexoptOptions {
		// actually shared at runtime.
		public static final int DEXOPT_AS_SHARED_LIBRARY = 1 << 6;

		// When set, indicates that dexopt is invoked from the background service.
		public static final int DEXOPT_IDLE_BACKGROUND_JOB = 1 << 9;

		// The name of package to optimize.
		private final String mPackageName;

		@@ -86,7 +89,8 @@ public final class DexoptOptions {
		DEXOPT_ONLY_SECONDARY_DEX \|
		DEXOPT_ONLY_SHARED_DEX \|
		DEXOPT_DOWNGRADE \|
		DEXOPT_AS_SHARED_LIBRARY;
		DEXOPT_AS_SHARED_LIBRARY \|
		DEXOPT_IDLE_BACKGROUND_JOB;
		if ((flags & (~validityMask)) != 0) {
		throw new IllegalArgumentException("Invalid flags : " + Integer.toHexString(flags));
		}
		@@ -133,6 +137,10 @@ public final class DexoptOptions {
		return (mFlags & DEXOPT_AS_SHARED_LIBRARY) != 0;
		}

		public boolean isDexoptIdleBackgroundJob() {
		return (mFlags & DEXOPT_IDLE_BACKGROUND_JOB) != 0;
		}

		public String getSplitName() {
		return mSplitName;
		}