Commit 61fab334 authored Apr 21, 2017 by android-build-team Robot

Merge cherrypicks of [2007123, 2089669, 2072002, 2094113, 1989895, 2094094,...

Merge cherrypicks of [2007123, 2089669, 2072002, 2094113, 1989895, 2094094, 2017568, 2054111, 2054025, 2074928, 2066476, 2092431, 2053944, 2095243, 2092549, 2065088, 2007730, 2008313, 2053983, 2025333, 2094716, 2026590, 2059276, 2089422, 2080090] into nyc-mr2-pixel-monthly-release

Change-Id: I744c621a943d3657db09c7f4d9b3eef92bae387e

parents 255fe8a8 cd248ac7

core/tests/coretests/src/android/os/BinderThreadPriorityTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ public class BinderThreadPriorityTest extends AndroidTestCase {
		}

		public static String expectedSchedulerGroup(int prio) {
		return prio < Process.THREAD_PRIORITY_BACKGROUND ? "/" : "/bg_non_interactive";
		return "/";
		}

		public void testPassPriorityToService() throws Exception {