Merge "Remove calls to VMRuntime methods that are no-ops." (ca1c6419) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -300,7 +300,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		String[] mInstrumentedSplitAppDirs = null;
		String mInstrumentedLibDir = null;
		boolean mSystemThread = false;
		boolean mJitEnabled = false;
		boolean mSomeActivitiesChanged = false;
		boolean mUpdatingSystemConfig = false;
		/* package */ boolean mHiddenApiWarningShown = false;
		@@ -1633,7 +1632,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		public static final int SUICIDE = 130;
		@UnsupportedAppUsage
		public static final int REMOVE_PROVIDER = 131;
		public static final int ENABLE_JIT = 132;
		public static final int DISPATCH_PACKAGE_BROADCAST = 133;
		@UnsupportedAppUsage
		public static final int SCHEDULE_CRASH = 134;
		@@ -1683,7 +1681,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		case DESTROY_BACKUP_AGENT: return "DESTROY_BACKUP_AGENT";
		case SUICIDE: return "SUICIDE";
		case REMOVE_PROVIDER: return "REMOVE_PROVIDER";
		case ENABLE_JIT: return "ENABLE_JIT";
		case DISPATCH_PACKAGE_BROADCAST: return "DISPATCH_PACKAGE_BROADCAST";
		case SCHEDULE_CRASH: return "SCHEDULE_CRASH";
		case DUMP_HEAP: return "DUMP_HEAP";
		@@ -1795,9 +1792,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		completeRemoveProvider((ProviderRefCount)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case ENABLE_JIT:
		ensureJitEnabled();
		break;
		case DISPATCH_PACKAGE_BROADCAST:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "broadcastPackage");
		handleDispatchPackageBroadcast(msg.arg1, (String[])msg.obj);
		@@ -1933,7 +1927,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		if (stopProfiling) {
		mProfiler.stopProfiling();
		}
		ensureJitEnabled();
		return false;
		}
		}
		@@ -2258,13 +2251,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		}
		}

		void ensureJitEnabled() {
		if (!mJitEnabled) {
		mJitEnabled = true;
		dalvik.system.VMRuntime.getRuntime().startJitCompilation();
		}
		}

		@UnsupportedAppUsage
		void scheduleGcIdler() {
		if (!mGcIdlerScheduled) {
		@@ -3690,7 +3676,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		ActivityManager.getService().serviceDoneExecuting(
		data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0);
		}
		ensureJitEnabled();
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}
		@@ -3804,7 +3789,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		ensureJitEnabled();
		} catch (Exception e) {
		if (!mInstrumentation.onException(s, e)) {
		throw new RuntimeException(
		@@ -5979,9 +5963,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		if (!data.restrictedBackupMode) {
		if (!ArrayUtils.isEmpty(data.providers)) {
		installContentProviders(app, data.providers);
		// For process that contains content providers, we want to
		// ensure that the JIT is enabled "at some point".
		mH.sendEmptyMessageDelayed(H.ENABLE_JIT, 10*1000);
		}
		}

		@@ -6614,12 +6595,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		sCurrentActivityThread = this;
		mSystemThread = system;
		if (!system) {
		ViewRootImpl.addFirstDrawHandler(new Runnable() {
		@Override
		public void run() {
		ensureJitEnabled();
		}
		});
		android.ddm.DdmHandleAppName.setAppName("<pre-initialized>",
		UserHandle.myUserId());
		RuntimeInit.setApplicationObject(mAppThread.asBinder());

services/java/com/android/server/SystemServer.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -1682,19 +1682,6 @@ public final class SystemServer {
		mSystemServiceManager.startService(StatsCompanionService.Lifecycle.class);
		traceEnd();

		if (safeMode) {
		traceBeginAndSlog("EnterSafeModeAndDisableJitCompilation");
		mActivityManagerService.enterSafeMode();
		// Disable the JIT for the system_server process
		VMRuntime.getRuntime().disableJitCompilation();
		traceEnd();
		} else {
		// Enable the JIT for the system_server process
		traceBeginAndSlog("StartJitCompilation");
		VMRuntime.getRuntime().startJitCompilation();
		traceEnd();
		}

		// MMS service broker
		traceBeginAndSlog("StartMmsService");
		mmsService = mSystemServiceManager.startService(MmsServiceBroker.class);