diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-18 00:55:40 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-18 00:55:40 +0000 |
commit | dee7c41e2d813ab3fae9e10230af897ba7749dad (patch) | |
tree | 50a2ff1a37876c7b290bb1d9d884dae6dd8f19cc | |
parent | efb9adeff9b6b9b6ea8cf3fa70b3045318725a4d (diff) | |
parent | b716a2551717fb5c91c8ec47925d65e3ec5ee214 (diff) | |
download | base-dee7c41e2d813ab3fae9e10230af897ba7749dad.tar.gz |
Merge cherrypicks of [2278225, 2279882, 2279862, 2278226, 2277057, 2279863, 2278227] into nyc-mr2-pixel-monthly-releaseandroid-7.1.2_r17android-7.1.2_r15
Change-Id: I1823477516e3ccbe0ed20238b243765647417241
-rw-r--r-- | core/tests/coretests/src/android/os/BinderThreadPriorityTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java index 7a4980a8ea96..56e977c7d687 100644 --- a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java +++ b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java @@ -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 { |