commit 9366ac021746043dadadf14561d64a46f22257ed
author Keun-young Park <keunyoung@google.com> Sun Nov 13 04:59:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 13 04:59:29 2016 +0000
tree aad34d13f50dce194b4d560cf6fe03aaeeab0dcc
parent fe7d3e9af09dcef4a8badaaf6a5ed66eb80e1a84
parent 0cc95abd4ec9167c3dda2ebb996ffdc68cc96a59

Merge "fix swapped min / max in priority parsing" am: 557359863c
am: ec2d5d8f04

Change-Id: I900b742d6edf9f25039a4997e6e2d2f34849786a

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 9fa11b8..f093dd9 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -357,8 +357,8 @@
 bool Service::ParsePriority(const std::vector<std::string>& args, std::string* err) {
     priority_ = 0;
     if (!ParseInt(args[1], &priority_,
-                  static_cast<int>(ANDROID_PRIORITY_LOWEST),
-                  static_cast<int>(ANDROID_PRIORITY_HIGHEST))) {
+                  static_cast<int>(ANDROID_PRIORITY_HIGHEST), // highest is negative
+                  static_cast<int>(ANDROID_PRIORITY_LOWEST))) {
         *err = StringPrintf("process priority value must be range %d - %d",
                 ANDROID_PRIORITY_HIGHEST, ANDROID_PRIORITY_LOWEST);
         return false;