Merge "Correctly abort dispatching on ANR." (d274f6ca) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -12814,7 +12814,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		timeout = getInputDispatchingTimeoutLocked(proc);
		}

		if (!inputDispatchingTimedOut(proc, null, null, aboveSystem, reason)) {
		if (inputDispatchingTimedOut(proc, null, null, aboveSystem, reason)) {
		return -1;
		}