commit 5a6a5a9b8223473f35c4486c0b3c8f2335e35b6f
author Yi Kong <yikong@google.com> Thu Oct 03 04:55:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 03 04:55:22 2019 +0000
tree 7681cee96f3340f55826f6a7c9b662b742e9759a
parent 3e9dd76e813cf04c9dd35a8c2e813c174e5b435e
parent 27b5c0d7a18b49df1e27cf499a3a41618e5027b7

Merge "Cast enum to uint32_t before comparing with AUDIO_MODE_CNT"

services/audiopolicy/engine/common/src/EngineBase.cpp

diff --git a/services/audiopolicy/engine/common/src/EngineBase.cpp b/services/audiopolicy/engine/common/src/EngineBase.cpp
index 07a7e65..840eb34 100644
--- a/services/audiopolicy/engine/common/src/EngineBase.cpp
+++ b/services/audiopolicy/engine/common/src/EngineBase.cpp
@@ -39,7 +39,7 @@
 {
     ALOGV("setPhoneState() state %d", state);
 
-    if (state < 0 || state >= AUDIO_MODE_CNT) {
+    if (state < 0 || uint32_t(state) >= AUDIO_MODE_CNT) {
         ALOGW("setPhoneState() invalid state %d", state);
         return BAD_VALUE;
     }