Merge "ActivityManager: Remove vestigial support for mDidDexOpt." (4bd91904) · Commits · e / os / android_frameworks_base

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

+0 −26

Original line number	Diff line number	Diff line
		@@ -1477,12 +1477,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		final ProcessMap<ArrayList<ProcessRecord>> mForegroundPackages
		= new ProcessMap<ArrayList<ProcessRecord>>();

		/**
		* This is set if we had to do a delayed dexopt of an app before launching
		* it, to increase the ANR timeouts in that case.
		*/
		boolean mDidDexOpt;

		/**
		* Set if the systemServer made a call to enterSafeMode.
		*/
		@@ -1965,13 +1959,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		} break;
		case SERVICE_TIMEOUT_MSG: {
		if (mDidDexOpt) {
		mDidDexOpt = false;
		Message nmsg = mHandler.obtainMessage(SERVICE_TIMEOUT_MSG);
		nmsg.obj = msg.obj;
		mHandler.sendMessageDelayed(nmsg, ActiveServices.SERVICE_TIMEOUT);
		return;
		}
		mServices.serviceTimeout((ProcessRecord)msg.obj);
		} break;
		case SERVICE_FOREGROUND_TIMEOUT_MSG: {
		@@ -2047,13 +2034,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		} break;
		case PROC_START_TIMEOUT_MSG: {
		if (mDidDexOpt) {
		mDidDexOpt = false;
		Message nmsg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);
		nmsg.obj = msg.obj;
		mHandler.sendMessageDelayed(nmsg, PROC_START_TIMEOUT);
		return;
		}
		ProcessRecord app = (ProcessRecord)msg.obj;
		synchronized (ActivityManagerService.this) {
		processStartTimedOutLocked(app);
		@@ -12807,12 +12787,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		return false;
		}

		if (mDidDexOpt) {
		// Give more time since we were dexopting.
		mDidDexOpt = false;
		return false;
		}

		if (proc.instr != null) {
		Bundle info = new Bundle();
		info.putString("shortMsg", "keyDispatchingTimedOut");

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -4356,13 +4356,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		case IDLE_TIMEOUT_MSG: {
		if (DEBUG_IDLE) Slog.d(TAG_IDLE,
		"handleMessage: IDLE_TIMEOUT_MSG: r=" + msg.obj);
		if (mService.mDidDexOpt) {
		mService.mDidDexOpt = false;
		Message nmsg = mHandler.obtainMessage(IDLE_TIMEOUT_MSG);
		nmsg.obj = msg.obj;
		mHandler.sendMessageDelayed(nmsg, IDLE_TIMEOUT);
		return;
		}
		// We don't at this point know if the activity is fullscreen,
		// so we need to be conservative and assume it isn't.
		activityIdleInternal((ActivityRecord) msg.obj,
		@@ -4388,11 +4381,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		}
		} break;
		case LAUNCH_TIMEOUT_MSG: {
		if (mService.mDidDexOpt) {
		mService.mDidDexOpt = false;
		mHandler.sendEmptyMessageDelayed(LAUNCH_TIMEOUT_MSG, LAUNCH_TIMEOUT);
		return;
		}
		synchronized (mService) {
		if (mLaunchingActivity.isHeld()) {
		Slog.w(TAG, "Launch timeout has expired, giving up wake lock!");

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -1399,13 +1399,6 @@ public final class BroadcastQueue {
		long now = SystemClock.uptimeMillis();
		BroadcastRecord r = mOrderedBroadcasts.get(0);
		if (fromMsg) {
		if (mService.mDidDexOpt) {
		// Delay timeouts until dexopt finishes.
		mService.mDidDexOpt = false;
		long timeoutTime = SystemClock.uptimeMillis() + mTimeoutPeriod;
		setBroadcastTimeoutLocked(timeoutTime);
		return;
		}
		if (!mService.mProcessesReady) {
		// Only process broadcast timeouts if the system is ready. That way
		// PRE_BOOT_COMPLETED broadcasts can't timeout as they are intended