Commit 01155fb2 authored Oct 02, 2019 by Yi Kong Committed by android-build-merger Oct 02, 2019

Merge "Cast enum to uint32_t before comparing with AUDIO_MODE_CNT" am:...

Merge "Cast enum to uint32_t before comparing with AUDIO_MODE_CNT" am: 5a6a5a9b am: 31d882ea am: b592a9ff
am: 50706603

Change-Id: Ic4585160d54a63a3d951a319cd8f61ecd13a5e4a

parents a13be84c 50706603

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ status_t EngineBase::setPhoneState(audio_mode_t state)
		{
		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;
		}