diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-04-21 20:42:02 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-04-21 20:42:02 +0000 |
| commit | 61fab3347ca5a59ed705b22083f56c7c1d600e1f (patch) | |
| tree | 50a2ff1a37876c7b290bb1d9d884dae6dd8f19cc | |
| parent | 255fe8a8ee8c4f1a5ae9abba6a555c6b7318b490 (diff) | |
| parent | cd248ac7ba3e034edffdb881327b7e20f705296a (diff) | |
| download | base-61fab3347ca5a59ed705b22083f56c7c1d600e1f.tar.gz | |
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-releaseandroid-7.1.2_r16
Change-Id: I744c621a943d3657db09c7f4d9b3eef92bae387e
| -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 { |