Merge "Use correct type for hardware call state"

This commit is contained in:
Glenn Kasten
2012-01-11 10:25:23 -08:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -294,7 +294,7 @@ status_t AudioFlinger::dumpInternals(int fd, const Vector<String16>& args)
const size_t SIZE = 256;
char buffer[SIZE];
String8 result;
int hardwareStatus = mHardwareStatus;
hardware_call_state hardwareStatus = mHardwareStatus;
snprintf(buffer, SIZE, "Hardware status: %d\n", hardwareStatus);
result.append(buffer);

View File

@@ -1383,7 +1383,7 @@ mutable Mutex mLock; // mutex for process, commands and handl
mutable Mutex mHardwareLock;
audio_hw_device_t* mPrimaryHardwareDev;
Vector<audio_hw_device_t*> mAudioHwDevs;
mutable int mHardwareStatus;
mutable hardware_call_state mHardwareStatus; // for dump only
DefaultKeyedVector< int, sp<PlaybackThread> > mPlaybackThreads;