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

Commit 77994d70 authored by Phil Burk's avatar Phil Burk Committed by Android (Google) Code Review
Browse files

Merge "aaudio: validate audio data format" into oc-dev

parents 2d12b8e3 5204d315

media/libaaudio/src/binding/AAudioBinderClient.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef AAUDIO_AAUDIO_BINDER_CLIENT_H

#define AAUDIO_AAUDIO_BINDER_CLIENT_H

#ifndef ANDROID_AAUDIO_AAUDIO_BINDER_CLIENT_H

#define ANDROID_AAUDIO_AAUDIO_BINDER_CLIENT_H



#include <aaudio/AAudio.h>

#include "AAudioServiceDefinitions.h"
@@ -91,4 +91,4 @@ public: 


} /* namespace aaudio */



#endif //AAUDIO_AAUDIO_BINDER_CLIENT_H
 
#endif //ANDROID_AAUDIO_AAUDIO_BINDER_CLIENT_H

media/libaaudio/src/binding/AAudioServiceInterface.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef AAUDIO_BINDING_AAUDIO_SERVICE_INTERFACE_H

#define AAUDIO_BINDING_AAUDIO_SERVICE_INTERFACE_H

#ifndef ANDROID_AAUDIO_BINDING_AAUDIO_SERVICE_INTERFACE_H

#define ANDROID_AAUDIO_BINDING_AAUDIO_SERVICE_INTERFACE_H



#include "binding/AAudioServiceDefinitions.h"

#include "binding/AAudioStreamRequest.h"
@@ -87,4 +87,4 @@ public: 


} /* namespace aaudio */



#endif //AAUDIO_BINDING_AAUDIO_SERVICE_INTERFACE_H
 
#endif //ANDROID_AAUDIO_BINDING_AAUDIO_SERVICE_INTERFACE_H

media/libaaudio/src/binding/AAudioServiceMessage.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef AAUDIO_AAUDIO_SERVICE_MESSAGE_H

#define AAUDIO_AAUDIO_SERVICE_MESSAGE_H

#ifndef ANDROID_AAUDIO_AAUDIO_SERVICE_MESSAGE_H

#define ANDROID_AAUDIO_AAUDIO_SERVICE_MESSAGE_H



#include <stdint.h>
@@ -64,4 +64,4 @@ typedef struct AAudioServiceMessage_s { 


} /* namespace aaudio */



#endif //AAUDIO_AAUDIO_SERVICE_MESSAGE_H
 
#endif //ANDROID_AAUDIO_AAUDIO_SERVICE_MESSAGE_H

media/libaaudio/src/binding/AAudioStreamConfiguration.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef BINDING_AAUDIO_STREAM_CONFIGURATION_H

#define BINDING_AAUDIO_STREAM_CONFIGURATION_H

#ifndef ANDROID_BINDING_AAUDIO_STREAM_CONFIGURATION_H

#define ANDROID_BINDING_AAUDIO_STREAM_CONFIGURATION_H



#include <stdint.h>
@@ -101,4 +101,4 @@ private: 


} /* namespace aaudio */



#endif //BINDING_AAUDIO_STREAM_CONFIGURATION_H
 
#endif //ANDROID_BINDING_AAUDIO_STREAM_CONFIGURATION_H

media/libaaudio/src/binding/AAudioStreamRequest.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef BINDING_AAUDIO_STREAM_REQUEST_H

#define BINDING_AAUDIO_STREAM_REQUEST_H

#ifndef ANDROID_BINDING_AAUDIO_STREAM_REQUEST_H

#define ANDROID_BINDING_AAUDIO_STREAM_REQUEST_H



#include <stdint.h>
@@ -95,4 +95,4 @@ protected: 


} /* namespace aaudio */



#endif //BINDING_AAUDIO_STREAM_REQUEST_H
 
#endif //ANDROID_BINDING_AAUDIO_STREAM_REQUEST_H