Merge "Simplify range check for audio_mode_t (continued)"

gkasten · Android (Google) Code Review · commit adf108377196 · 2012-01-19T06:09:20.000-08:00
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
@@ -548,6 +548,7 @@ audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t d
 
 status_t AudioSystem::setPhoneState(audio_mode_t state)
 {
+    if (uint32_t(state) >= AUDIO_MODE_CNT) return BAD_VALUE;
     const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
     if (aps == 0) return PERMISSION_DENIED;
 

Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,7 @@ audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t d`
`548`	`548`
`549`	`549`	`status_t AudioSystem::setPhoneState(audio_mode_t state)`
`550`	`550`	`{`
	`551`	`+ if (uint32_t(state) >= AUDIO_MODE_CNT) return BAD_VALUE;`
`551`	`552`	`const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();`
`552`	`553`	`if (aps == 0) return PERMISSION_DENIED;`
`553`	`554`