commit 9468b0ade456827adedbe2fd8d35d7a3a9a31174
author Steven Moreland <smoreland@google.com> Wed Sep 19 19:36:12 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 19 19:36:12 2018 -0700
tree 0ccbd1ed7de36523c3df1a3d60479703b136be6b
parent def9d98746aa18aa453f4245538bcad4a4467287
parent 91feb47dc13337e4f5a172c971058f4058333cb1

Proper checks for SCHED_NORMAL. am: b7798be47e
am: 91feb47dc1

Change-Id: I16e00faf86fc3b1ae8d64348d8be32396942d389

transport/HidlTransportSupport.cpp

diff --git a/transport/HidlTransportSupport.cpp b/transport/HidlTransportSupport.cpp
index b214f1a..591ccba 100644
--- a/transport/HidlTransportSupport.cpp
+++ b/transport/HidlTransportSupport.cpp
@@ -47,17 +47,24 @@
         return false;
     }
 
-    if (policy != SCHED_NORMAL && policy != SCHED_FIFO && policy != SCHED_RR) {
-        LOG(ERROR) << "Invalid scheduler policy " << policy;
-        return false;
-    }
-
-    if (policy == SCHED_NORMAL && (priority < -20 || priority > 19)) {
-        LOG(ERROR) << "Invalid priority for SCHED_NORMAL: " << priority;
-        return false;
-    } else if (priority < 1 || priority > 99) {
-        LOG(ERROR) << "Invalid priority for real-time policy: " << priority;
-        return false;
+    switch (policy) {
+        case SCHED_NORMAL: {
+            if (priority < -20 || priority > 19) {
+                LOG(ERROR) << "Invalid priority for SCHED_NORMAL: " << priority;
+                return false;
+            }
+        } break;
+        case SCHED_RR:
+        case SCHED_FIFO: {
+            if (priority < 1 || priority > 99) {
+                LOG(ERROR) << "Invalid priority for " << policy << " policy: " << priority;
+                return false;
+            }
+        } break;
+        default: {
+            LOG(ERROR) << "Invalid scheduler policy " << policy;
+            return false;
+        }
     }
 
     // Due to ABI considerations, IBase cannot have a destructor to clean this up.