diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-04-20 22:40:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-04-20 22:40:11 +0000 |
commit | 57ff3912387dea7f3f103efec82aea24bf362ad7 (patch) | |
tree | 50a2ff1a37876c7b290bb1d9d884dae6dd8f19cc | |
parent | a930fdd38c6a8eb9584fed9322359d40387fbcdd (diff) | |
parent | a09cb5d47a3492ebf7d019ad2c2e41275a10f073 (diff) | |
download | base-57ff3912387dea7f3f103efec82aea24bf362ad7.tar.gz |
Merge cherrypicks of [2089422, 2053944, 2094094, 2007730, 2072002, 2065088, 1989895, 2080090, 2026590, 2008313, 2089669, 2059276, 2094716, 2066476, 2053983, 2007123, 2017568, 2054111, 2054025, 2095243, 2092431, 2092549, 2025333, 2099168, 2074928] into nyc-mr2-pixel-monthly-release
Change-Id: I4a8cb0109b07a372131d3c860f262c27ef1e5769
-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 { |