resolved conflicts for merge of 485d7a31 to master (add58212) · Commits · e / os / android_frameworks_base

cmds/am/src/com/android/commands/am/Am.java

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1109,6 +1109,18 @@ public class Am extends BaseCommand {
	}		}
	}		}

			@Override
			public int systemNotResponding(String message)
			throws RemoteException {
			synchronized (this) {
			System.out.println("** ERROR: PROCESS NOT RESPONDING");
			System.out.println("message: " + message);
			System.out.println("#");
			System.out.println("Allowing system to die.");
			return -1;
			}
			}

	void killGdbLocked() {		void killGdbLocked() {
	mGotGdbPrint = false;		mGotGdbPrint = false;
	if (mGdbProcess != null) {		if (mGdbProcess != null) {

core/java/android/app/IActivityController.aidl

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -58,4 +58,11 @@ interface IActivityController
	* immediately.		* immediately.
	*/		*/
	int appNotResponding(String processName, int pid, String processStats);		int appNotResponding(String processName, int pid, String processStats);

			/**
			* The system process watchdog has detected that the system seems to be
			* hung. Return 1 to continue waiting, or -1 to let it continue with its
			* normal kill.
			*/
			int systemNotResponding(String msg);
	}		}

core/java/android/os/Binder.java

+31 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,11 @@ public class Binder implements IBinder {
	private static final boolean FIND_POTENTIAL_LEAKS = false;		private static final boolean FIND_POTENTIAL_LEAKS = false;
	private static final String TAG = "Binder";		private static final String TAG = "Binder";

			/**
			* Control whether dump() calls are allowed.
			*/
			private static String sDumpDisabled = null;

	/* mObject is used by native code, do not remove or rename */		/* mObject is used by native code, do not remove or rename */
	private int mObject;		private int mObject;
	private IInterface mOwner;		private IInterface mOwner;
	@@ -225,6 +230,22 @@ public class Binder implements IBinder {
	return null;		return null;
	}		}

			/**
			* Control disabling of dump calls in this process. This is used by the system
			* process watchdog to disable incoming dump calls while it has detecting the system
			* is hung and is reporting that back to the activity controller. This is to
			* prevent the controller from getting hung up on bug reports at this point.
			* @hide
			*
			* @param msg The message to show instead of the dump; if null, dumps are
			* re-enabled.
			*/
			public static void setDumpDisabled(String msg) {
			synchronized (Binder.class) {
			sDumpDisabled = msg;
			}
			}

	/**		/**
	* Default implementation is a stub that returns false. You will want		* Default implementation is a stub that returns false. You will want
	* to override this to do the appropriate unmarshalling of transactions.		* to override this to do the appropriate unmarshalling of transactions.
	@@ -269,7 +290,15 @@ public class Binder implements IBinder {
	FileOutputStream fout = new FileOutputStream(fd);		FileOutputStream fout = new FileOutputStream(fd);
	PrintWriter pw = new PrintWriter(fout);		PrintWriter pw = new PrintWriter(fout);
	try {		try {
			final String disabled;
			synchronized (Binder.class) {
			disabled = sDumpDisabled;
			}
			if (disabled == null) {
	dump(fd, pw, args);		dump(fd, pw, args);
			} else {
			pw.println(sDumpDisabled);
			}
	} finally {		} finally {
	pw.flush();		pw.flush();
	}		}

services/java/com/android/server/Watchdog.java

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,9 @@

	package com.android.server;		package com.android.server;

			import android.app.IActivityController;
			import android.os.Binder;
			import android.os.RemoteException;
	import com.android.server.am.ActivityManagerService;		import com.android.server.am.ActivityManagerService;
	import com.android.server.power.PowerManagerService;		import com.android.server.power.PowerManagerService;

	@@ -89,6 +92,7 @@ public class Watchdog extends Thread {
	ActivityManagerService mActivity;		ActivityManagerService mActivity;

	int mPhonePid;		int mPhonePid;
			IActivityController mController;

	final Calendar mCalendar = Calendar.getInstance();		final Calendar mCalendar = Calendar.getInstance();
	int mMinScreenOff = MEMCHECK_DEFAULT_MIN_SCREEN_OFF;		int mMinScreenOff = MEMCHECK_DEFAULT_MIN_SCREEN_OFF;
	@@ -260,6 +264,12 @@ public class Watchdog extends Thread {
	}		}
	}		}

			public void setActivityController(IActivityController controller) {
			synchronized (this) {
			mController = controller;
			}
			}

	public void addMonitor(Monitor monitor) {		public void addMonitor(Monitor monitor) {
	synchronized (this) {		synchronized (this) {
	if (isAlive()) {		if (isAlive()) {
	@@ -549,6 +559,25 @@ public class Watchdog extends Thread {
	dropboxThread.join(2000); // wait up to 2 seconds for it to return.		dropboxThread.join(2000); // wait up to 2 seconds for it to return.
	} catch (InterruptedException ignored) {}		} catch (InterruptedException ignored) {}

			IActivityController controller;
			synchronized (this) {
			controller = mController;
			}
			if (controller != null) {
			Slog.i(TAG, "Reporting stuck state to activity controller");
			try {
			Binder.setDumpDisabled("Service dumps disabled due to hung system process.");
			// 1 = keep waiting, -1 = kill system
			int res = controller.systemNotResponding(name);
			if (res >= 0) {
			Slog.i(TAG, "Activity controller requested to coninue to wait");
			waitedHalf = false;
			continue;
			}
			} catch (RemoteException e) {
			}
			}

	// Only kill the process if the debugger is not attached.		// Only kill the process if the debugger is not attached.
	if (!Debug.isDebuggerConnected()) {		if (!Debug.isDebuggerConnected()) {
	Slog.w(TAG, "*** WATCHDOG KILLING SYSTEM PROCESS: " + name);		Slog.w(TAG, "*** WATCHDOG KILLING SYSTEM PROCESS: " + name);

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2920,6 +2920,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	resumeOK = mController.activityResuming(next.packageName);		resumeOK = mController.activityResuming(next.packageName);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	mController = null;		mController = null;
			Watchdog.getInstance().setActivityController(null);
	}		}

	if (!resumeOK) {		if (!resumeOK) {
	@@ -3413,6 +3414,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	if (res < 0 && app.pid != MY_PID) Process.killProcess(app.pid);		if (res < 0 && app.pid != MY_PID) Process.killProcess(app.pid);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	mController = null;		mController = null;
			Watchdog.getInstance().setActivityController(null);
	}		}
	}		}

	@@ -3516,6 +3518,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	mController = null;		mController = null;
			Watchdog.getInstance().setActivityController(null);
	}		}
	}		}

	@@ -7569,6 +7572,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	"setActivityController()");		"setActivityController()");
	synchronized (this) {		synchronized (this) {
	mController = controller;		mController = controller;
			Watchdog.getInstance().setActivityController(controller);
	}		}
	}		}

	@@ -8932,6 +8936,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	mController = null;		mController = null;
			Watchdog.getInstance().setActivityController(null);
	}		}
	}		}