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

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

Merge changes I0b1a0979,I4aa89a39 

* changes:
  Added AOSP license headers.
  Remove HIDL_GENERATED from things written by hand.
parents a5ee7b0b 9f8b5c7b

audio/2.0/default/Device.h

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

 */



#ifndef HIDL_GENERATED_android_hardware_audio_V2_0_Device_H_

#define HIDL_GENERATED_android_hardware_audio_V2_0_Device_H_

#ifndef ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H

#define ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H



#include <memory>
@@ -144,4 +144,4 @@ struct Device : public IDevice, public ParametersUtil { 
}  // namespace hardware

}  // namespace android



#endif  // HIDL_GENERATED_android_hardware_audio_V2_0_Device_H_
 
#endif  // ANDROID_HARDWARE_AUDIO_V2_0_DEVICE_H

audio/2.0/default/DevicesFactory.h

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

 */



#ifndef HIDL_GENERATED_android_hardware_audio_V2_0_DevicesFactory_H_

#define HIDL_GENERATED_android_hardware_audio_V2_0_DevicesFactory_H_

#ifndef ANDROID_HARDWARE_AUDIO_V2_0_DEVICESFACTORY_H

#define ANDROID_HARDWARE_AUDIO_V2_0_DEVICESFACTORY_H



#include <hardware/audio.h>
@@ -56,4 +56,4 @@ extern "C" IDevicesFactory* HIDL_FETCH_IDevicesFactory(const char* name); 
}  // namespace hardware

}  // namespace android



#endif  // HIDL_GENERATED_android_hardware_audio_V2_0_DevicesFactory_H_
 
#endif  // ANDROID_HARDWARE_AUDIO_V2_0_DEVICESFACTORY_H

audio/2.0/default/PrimaryDevice.h

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

 */



#ifndef HIDL_GENERATED_android_hardware_audio_V2_0_PrimaryDevice_H_

#define HIDL_GENERATED_android_hardware_audio_V2_0_PrimaryDevice_H_

#ifndef ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H

#define ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H



#include <android/hardware/audio/2.0/IPrimaryDevice.h>

#include <hidl/Status.h>
@@ -114,4 +114,4 @@ struct PrimaryDevice : public IPrimaryDevice { 
}  // namespace hardware

}  // namespace android



#endif  // HIDL_GENERATED_android_hardware_audio_V2_0_PrimaryDevice_H_
 
#endif  // ANDROID_HARDWARE_AUDIO_V2_0_PRIMARYDEVICE_H

audio/2.0/default/Stream.h

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

 */



#ifndef HIDL_GENERATED_android_hardware_audio_V2_0_Stream_H_

#define HIDL_GENERATED_android_hardware_audio_V2_0_Stream_H_

#ifndef ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H

#define ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H



#include <android/hardware/audio/2.0/IStream.h>

#include <hidl/Status.h>
@@ -91,4 +91,4 @@ struct Stream : public IStream, public ParametersUtil { 
}  // namespace hardware

}  // namespace android



#endif  // HIDL_GENERATED_android_hardware_audio_V2_0_Stream_H_
 
#endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H

audio/2.0/default/StreamIn.h

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

 */



#ifndef HIDL_GENERATED_android_hardware_audio_V2_0_StreamIn_H_

#define HIDL_GENERATED_android_hardware_audio_V2_0_StreamIn_H_

#ifndef ANDROID_HARDWARE_AUDIO_V2_0_STREAMIN_H

#define ANDROID_HARDWARE_AUDIO_V2_0_STREAMIN_H



#include <android/hardware/audio/2.0/IStreamIn.h>

#include <hidl/Status.h>
@@ -95,4 +95,4 @@ struct StreamIn : public IStreamIn { 
}  // namespace hardware

}  // namespace android



#endif  // HIDL_GENERATED_android_hardware_audio_V2_0_StreamIn_H_
 
#endif  // ANDROID_HARDWARE_AUDIO_V2_0_STREAMIN_H