diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-11-30 18:15:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-30 18:15:48 +0000 |
| commit | 32094ca29f4f9314bacc9d4644966ad5ffac0673 (patch) | |
| tree | 03ad348c15dd4ba90baf86c7a8767aa780d8db8b /broadcastradio | |
| parent | a5ee7b0b9352dc112b52fa47c7871eb08b87178f (diff) | |
| parent | 9f8b5c7b1649c989c21fbb88781c36ed95e4d358 (diff) | |
| download | android_hardware_interfaces-32094ca29f4f9314bacc9d4644966ad5ffac0673.tar.gz android_hardware_interfaces-32094ca29f4f9314bacc9d4644966ad5ffac0673.tar.bz2 android_hardware_interfaces-32094ca29f4f9314bacc9d4644966ad5ffac0673.zip | |
Merge changes I0b1a0979,I4aa89a39
* changes:
Added AOSP license headers.
Remove HIDL_GENERATED from things written by hand.
Diffstat (limited to 'broadcastradio')
| -rw-r--r-- | broadcastradio/1.0/default/BroadcastRadio.h | 6 | ||||
| -rw-r--r-- | broadcastradio/1.0/default/BroadcastRadioFactory.h | 6 | ||||
| -rw-r--r-- | broadcastradio/1.0/default/Tuner.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/broadcastradio/1.0/default/BroadcastRadio.h b/broadcastradio/1.0/default/BroadcastRadio.h index dbd6e0777..6764d82a0 100644 --- a/broadcastradio/1.0/default/BroadcastRadio.h +++ b/broadcastradio/1.0/default/BroadcastRadio.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef HIDL_GENERATED_android_hardware_broadcastradio_V1_0_BroadcastRadio_H_ -#define HIDL_GENERATED_android_hardware_broadcastradio_V1_0_BroadcastRadio_H_ +#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_0_BROADCASTRADIO_H +#define ANDROID_HARDWARE_BROADCASTRADIO_V1_0_BROADCASTRADIO_H #include <android/hardware/broadcastradio/1.0/IBroadcastRadio.h> #include <hidl/Status.h> @@ -68,4 +68,4 @@ private: } // namespace hardware } // namespace android -#endif // HIDL_GENERATED_android_hardware_broadcastradio_V1_0_BroadcastRadio_H_ +#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_0_BROADCASTRADIO_H diff --git a/broadcastradio/1.0/default/BroadcastRadioFactory.h b/broadcastradio/1.0/default/BroadcastRadioFactory.h index 9b2ca17ef..97f7f554f 100644 --- a/broadcastradio/1.0/default/BroadcastRadioFactory.h +++ b/broadcastradio/1.0/default/BroadcastRadioFactory.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef HIDL_GENERATED_android_hardware_broadcastradio_V1_0_BroadcastRadioFactory_H_ -#define HIDL_GENERATED_android_hardware_broadcastradio_V1_0_BroadcastRadioFactory_H_ +#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_0_BROADCASTRADIOFACTORY_H +#define ANDROID_HARDWARE_BROADCASTRADIO_V1_0_BROADCASTRADIOFACTORY_H #include <android/hardware/broadcastradio/1.0/IBroadcastRadioFactory.h> #include <hidl/Status.h> @@ -40,4 +40,4 @@ extern "C" IBroadcastRadioFactory* HIDL_FETCH_IBroadcastRadioFactory(const char* } // namespace hardware } // namespace android -#endif // HIDL_GENERATED_android_hardware_broadcastradio_V1_0_BroadcastRadioFactory_H_ +#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_0_BROADCASTRADIOFACTORY_H diff --git a/broadcastradio/1.0/default/Tuner.h b/broadcastradio/1.0/default/Tuner.h index 94e216e57..a621d974f 100644 --- a/broadcastradio/1.0/default/Tuner.h +++ b/broadcastradio/1.0/default/Tuner.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef HIDL_GENERATED_android_hardware_broadcastradio_V1_0_Tuner_H_ -#define HIDL_GENERATED_android_hardware_broadcastradio_V1_0_Tuner_H_ +#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_0_TUNER_H +#define ANDROID_HARDWARE_BROADCASTRADIO_V1_0_TUNER_H #include <android/hardware/broadcastradio/1.0/ITuner.h> #include <android/hardware/broadcastradio/1.0/ITunerCallback.h> @@ -64,4 +64,4 @@ struct Tuner : public ITuner { } // namespace hardware } // namespace android -#endif // HIDL_GENERATED_android_hardware_broadcastradio_V1_0_Tuner_H_ +#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_0_TUNER_H |