Merge "Cleanup license formatting"

chalko · Gerrit Code Review · commit 85dcf3b5792f · 2017-06-01T20:17:30.000Z
diff --git a/app/src/main/java/com/example/android/sampletvinput/MainActivity.java b/app/src/main/java/com/example/android/sampletvinput/MainActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/MainFragment.java b/app/src/main/java/com/example/android/sampletvinput/MainFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/app/src/main/java/com/example/android/sampletvinput/SampleJobService.java b/app/src/main/java/com/example/android/sampletvinput/SampleJobService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/DashRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/DashRendererBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java b/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/ExtractorRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/ExtractorRendererBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/FakeTrickplayRunnable.java b/app/src/main/java/com/example/android/sampletvinput/player/FakeTrickplayRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/HlsRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/HlsRendererBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/RendererBuilderFactory.java b/app/src/main/java/com/example/android/sampletvinput/player/RendererBuilderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingRendererBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingTestMediaDrmCallback.java b/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingTestMediaDrmCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/WidevineTestMediaDrmCallback.java b/app/src/main/java/com/example/android/sampletvinput/player/WidevineTestMediaDrmCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsActivity.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsFragment.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkSidePanelActivity.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkSidePanelActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichBootReceiver.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichBootReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichFeedUtil.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichFeedUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputService.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputSetupActivity.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputSetupActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/android/tv/testing/Utils.java b/library/src/androidTest/java/com/android/tv/testing/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/ChannelSetupFragmentTest.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/ChannelSetupFragmentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/EpgSyncWithAdsJobServiceTest.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/EpgSyncWithAdsJobServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/MockTvPlayer.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/MockTvPlayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/PeriodicEpgSyncJobServiceTest.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/PeriodicEpgSyncJobServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestActivity.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestJobService.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestJobService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestTvInputService.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestTvInputService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/BaseTvInputService.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/BaseTvInputService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/TvPlayer.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/TvPlayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/ads/EpgSyncWithAdsJobService.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/ads/EpgSyncWithAdsJobService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Android Open Source Project
+ * Copyright 2017 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/model/RecordedProgram.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/model/RecordedProgram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupFragment.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/sync/EpgSyncJobService.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/sync/EpgSyncJobService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/CollectionUtils.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/Constants.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright 2017 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/TvContractUtils.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/TvContractUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParser.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 The Android Open Source Project
+ * Copyright 2015 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/model/AdvertisementTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/model/AdvertisementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/model/ChannelTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/model/ChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/model/InternalProviderDataTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/model/InternalProviderDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/model/ProgramTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/model/ProgramTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/model/RecordedProgramTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/model/RecordedProgramTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvAdvertisementTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvAdvertisementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParserTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Android Open Source Project
+ * Copyright 2016 The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2015 The Android Open Source Project`
	`2`	`+ * Copyright 2015 The Android Open Source Project.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2015 The Android Open Source Project`
	`2`	`+ * Copyright 2015 The Android Open Source Project.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except`
`5`	`5`	`* in compliance with the License. You may obtain a copy of the License at`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016 The Android Open Source Project`
	`2`	`+ * Copyright 2016 The Android Open Source Project.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2016 The Android Open Source Project`
	`2`	`+ * Copyright 2016 The Android Open Source Project.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`