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

Commit a0d38208 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Audio policy: remove using namespace std in header"

parents d3084998 fbdfebe5

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+3 −2
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ status_t AudioPolicyService::startInput(audio_port_handle_t portId, bool *silenc 
                item->setCString(kAudioPolicyRqstPkg,

                                 std::string(String8(client->opPackageName).string()).c_str());

            } else {

                item->setCString(kAudioPolicyRqstPkg, to_string(client->uid).c_str());

                item->setCString(kAudioPolicyRqstPkg, std::to_string(client->uid).c_str());

            }

            item->setCString(

                    kAudioPolicyRqstDevice, getDeviceTypeStrForPortId(client->deviceId).c_str());
@@ -558,7 +558,8 @@ status_t AudioPolicyService::startInput(audio_port_handle_t portId, bool *silenc 
                            item->setCString(kAudioPolicyActivePkg,

                                 std::string(String8(other->opPackageName).string()).c_str());

                        } else {

                            item->setCString(kAudioPolicyRqstPkg, to_string(other->uid).c_str());

                            item->setCString(kAudioPolicyRqstPkg,

                                             std::to_string(other->uid).c_str());

                        }

                        item->setCString(kAudioPolicyActiveDevice,

                                         getDeviceTypeStrForPortId(other->deviceId).c_str());

services/audiopolicy/service/AudioPolicyService.h

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 


namespace android {



using namespace std;



// ----------------------------------------------------------------------------



class AudioPolicyService :