Merge "Don't crash system server when setting scheduler." into nyc-mr1-dev (2f917df4) · Commits · e / os / android_frameworks_base

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

+11 −6

Original line number	Diff line number	Diff line
		@@ -2328,6 +2328,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		ProcessRecord proc = r.app;
		if (proc.vrThreadTid > 0) {
		if (proc.curSchedGroup == ProcessList.SCHED_GROUP_TOP_APP) {
		try {
		if (mInVrMode == true) {
		Process.setThreadScheduler(proc.vrThreadTid,
		Process.SCHED_FIFO \| Process.SCHED_RESET_ON_FORK, 1);
		@@ -2335,6 +2336,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		Process.setThreadScheduler(proc.vrThreadTid,
		Process.SCHED_OTHER, 0);
		}
		} catch (IllegalArgumentException e) {
		Slog.e(TAG, "Failed to set scheduling policy, thread does"
		+ " not exist:\n" + e);
		}
		}
		}
		}