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

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

Merge changes Ia0217951,Ie8293036,Ic359e977,I9d939d17 

* changes:
  audiopolicy: Refactor AudioPolicyManager::updateCallRouting
  audiopolicy: Remove ; after namespace bracket
  audiopolicy: Use C++11 atomics, factor out handle generation
  audiopolicy: Make fields of HwModule private
parents 3700e162 b567ba06

services/audiopolicy/AudioPolicyInterface.h

+1 −1
Original line number Diff line number Diff line
@@ -355,6 +355,6 @@ extern "C" AudioPolicyInterface* createAudioPolicyManager(AudioPolicyClientInter 
extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface);





}; // namespace android

} // namespace android



#endif // ANDROID_AUDIOPOLICY_INTERFACE_H

services/audiopolicy/common/managerdefinitions/include/AudioCollections.h

+1 −1
Original line number Diff line number Diff line
@@ -41,4 +41,4 @@ public: 
    status_t dump(int fd, int spaces) const;

};



}; // namespace android
 
} // namespace android

services/audiopolicy/common/managerdefinitions/include/AudioGain.h

+1 −1
Original line number Diff line number Diff line
@@ -66,4 +66,4 @@ private: 
    bool              mUseInChannelMask;

};



}; // namespace android
 
} // namespace android

services/audiopolicy/common/managerdefinitions/include/AudioInputDescriptor.h

+1 −1
Original line number Diff line number Diff line
@@ -121,4 +121,4 @@ public: 
};





}; // namespace android
 
} // namespace android

services/audiopolicy/common/managerdefinitions/include/AudioOutputDescriptor.h

+1 −1
Original line number Diff line number Diff line
@@ -214,4 +214,4 @@ public: 
};





}; // namespace android
 
} // namespace android