Revert 94479fd5405642c67efd14cebe722feb9cbe6e77
Change-Id: I5ca78d5462badf541868785b2ba2e3f6d0cf492a
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index e66abb1..b2aa388 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1123,7 +1123,7 @@
mChannelCount(0),
mFrameSize(1), mFormat(AUDIO_FORMAT_INVALID),
mParamStatus(NO_ERROR),
- mStandby(false), mDevice((audio_devices_t) device), mId(id),
+ mStandby(false), mDevice(device), mId(id),
mDeathRecipient(new PMDeathRecipient(this))
{
}
@@ -3419,7 +3419,7 @@
#ifdef ADD_BATTERY_DATA
// when changing the audio output device, call addBatteryData to notify
// the change
- if ((int)mDevice != value) {
+ if (mDevice != value) {
uint32_t params = 0;
// check whether speaker is on
if (value & AUDIO_DEVICE_OUT_SPEAKER) {
@@ -3441,7 +3441,7 @@
// forward device change to effects that have requested to be
// aware of attached audio device.
- mDevice = (audio_devices_t) value;
+ mDevice = value;
for (size_t i = 0; i < mEffectChains.size(); i++) {
mEffectChains[i]->setDevice_l(mDevice);
}
@@ -6468,12 +6468,12 @@
// store input device and output device but do not forward output device to audio HAL.
// Note that status is ignored by the caller for output device
// (see AudioFlinger::setParameters()
- uint32_t /*audio_devices_t*/ newDevice = mDevice;
+ audio_devices_t newDevice = mDevice;
if (value & AUDIO_DEVICE_OUT_ALL) {
- newDevice &= (uint32_t)~(value & AUDIO_DEVICE_OUT_ALL);
+ newDevice &= ~(value & AUDIO_DEVICE_OUT_ALL);
status = BAD_VALUE;
} else {
- newDevice &= (uint32_t)~(value & AUDIO_DEVICE_IN_ALL);
+ newDevice &= ~(value & AUDIO_DEVICE_IN_ALL);
// disable AEC and NS if the device is a BT SCO headset supporting those pre processings
if (mTrack != NULL) {
bool suspend = audio_is_bluetooth_sco_device(
@@ -6483,7 +6483,7 @@
}
}
newDevice |= value;
- mDevice = (audio_devices_t) newDevice; // since mDevice is read by other threads, only write to it once
+ mDevice = newDevice; // since mDevice is read by other threads, only write to it once
}
if (status == NO_ERROR) {
status = mInput->stream->common.set_parameters(&mInput->stream->common, keyValuePair.string());