Merge cherrypicks of [2278225, 2279882, 2279862, 2278226, 2277057, 2279863,...

Merge cherrypicks of [2278225, 2279882, 2279862, 2278226, 2277057, 2279863, 2278227] into nyc-mr2-pixel-monthly-release

Change-Id: I1823477516e3ccbe0ed20238b243765647417241

parents efb9adef b716a255

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 {