Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88ef0a73 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use correct type for hardware call state"

parents f733831f a934c2cd

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -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;