diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-11 10:25:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-11 10:25:23 -0800 |
| commit | c40256146bee58bff09e1c16ef99ea06d31f89f9 (patch) | |
| tree | ff6a1d83349e949e123212eeda04199770565229 /services | |
| parent | 0132e12ded92529b1520ad62f5134fa31361c90b (diff) | |
| parent | a4454b4765c5905f14186893b0688be375642283 (diff) | |
| download | frameworks_av-c40256146bee58bff09e1c16ef99ea06d31f89f9.zip frameworks_av-c40256146bee58bff09e1c16ef99ea06d31f89f9.tar.gz frameworks_av-c40256146bee58bff09e1c16ef99ea06d31f89f9.tar.bz2 | |
Merge "Use correct type for hardware call state"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 90b4dba..b238979 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index ff8dedb..f99e764 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -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; |