resolve merge conflicts of e6dddc99898fe5da4d24e6c3caf6e93386da5b2c to qt-qpr1-dev-plus-aosp (f096a5cc) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -360,7 +360,6 @@ import com.android.server.contentcapture.ContentCaptureManagerInternal;
		import com.android.server.firewall.IntentFirewall;
		import com.android.server.job.JobSchedulerInternal;
		import com.android.server.pm.Installer;
		import com.android.server.pm.Installer.InstallerException;
		import com.android.server.uri.GrantUri;
		import com.android.server.uri.UriGrantsManagerInternal;
		import com.android.server.utils.PriorityDump;
		@@ -372,8 +371,6 @@ import com.android.server.wm.ActivityTaskManagerService;
		import com.android.server.wm.WindowManagerService;
		import com.android.server.wm.WindowProcessController;

		import dalvik.system.VMRuntime;

		import libcore.util.EmptyArray;

		import java.io.File;
		@@ -5240,26 +5237,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		mCallFinishBooting = false;
		}

		ArraySet<String> completedIsas = new ArraySet<String>();
		for (String abi : Build.SUPPORTED_ABIS) {
		ZYGOTE_PROCESS.establishZygoteConnectionForAbi(abi);
		final String instructionSet = VMRuntime.getInstructionSet(abi);
		if (!completedIsas.contains(instructionSet)) {
		try {
		mInstaller.markBootComplete(VMRuntime.getInstructionSet(abi));
		} catch (InstallerException e) {
		if (!VMRuntime.didPruneDalvikCache()) {
		// This is technically not the right filter, as different zygotes may
		// have made different pruning decisions. But the log is best effort,
		// anyways.
		Slog.w(TAG, "Unable to mark boot complete for abi: " + abi + " (" +
		e.getMessage() +")");
		}
		}
		completedIsas.add(instructionSet);
		}
		}

		// Let the ART runtime in zygote and system_server know that the boot completed.
		ZYGOTE_PROCESS.bootCompleted();
		VMRuntime.bootCompleted();

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -434,16 +434,6 @@ public class Installer extends SystemService {
		}
		}

		public void markBootComplete(String instructionSet) throws InstallerException {
		assertValidInstructionSet(instructionSet);
		if (!checkBeforeRemote()) return;
		try {
		mInstalld.markBootComplete(instructionSet);
		} catch (Exception e) {
		throw InstallerException.from(e);
		}
		}

		public void freeCache(String uuid, long targetFreeBytes, long cacheReservedBytes, int flags)
		throws InstallerException {
		if (!checkBeforeRemote()) return;