am 173bb615: Merge "Move stack dump off of InputDispatcher thread" into jb-mr2-dev (9990e67b) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -7234,7 +7234,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		SystemProperties.set("ctl.start", "bugreport");
		}

		public long inputDispatchingTimedOut(int pid, boolean aboveSystem) {
		public long inputDispatchingTimedOut(int pid, final boolean aboveSystem) {
		if (checkCallingPermission(android.Manifest.permission.FILTER_EVENTS)
		!= PackageManager.PERMISSION_GRANTED) {
		throw new SecurityException("Requires permission "
		@@ -7270,7 +7270,13 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		if (proc != null) {
		appNotResponding(proc, null, null, aboveSystem, "keyDispatchingTimedOut");
		final ProcessRecord pr = proc;
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		appNotResponding(pr, null, null, aboveSystem, "keyDispatchingTimedOut");
		}
		});
		if (proc.instrumentationClass != null \|\| proc.usingWrapper) {
		return INSTRUMENTATION_KEY_DISPATCHING_TIMEOUT;
		}