[automerger] Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev am: 472ba43619 am: e069b9dbd6 am: 3840033f08 am: c53268693c am: 93e1223544 -s ours am: 9abaf8b016
Change-Id: I0cb1fce55bde4b99c4973dba5d73a5ac6fc2758d
diff --git a/3_software/3_12_tv-input-framework.md b/3_software/3_12_tv-input-framework.md
index 0bca402..0cddf65 100644
--- a/3_software/3_12_tv-input-framework.md
+++ b/3_software/3_12_tv-input-framework.md
@@ -11,7 +11,6 @@
* [C-1-2] MUST preload a TV application (TV App) and meet all requirements
described in [section 3.12.1](#3_12_tv-input-framework).
-
### 3.12.1\. TV App
If device implementations support TIF:
@@ -68,21 +67,18 @@
* Changing TV channels
* Opening EPG
- * Configuring and tuning to third-party TIF-based inputs
+ * Configuring and tuning to third-party TIF-based inputs (if those inputs are supported)
* Opening Settings menu
* SHOULD pass key events to HDMI inputs through CEC.
#### 3.12.1.3\. TV input app linking
-If device implementations support TIF, they:
-
-* [C-1-1] Android Television device implementations MUST support
-[TV input app linking](
-http://developer.android.com/reference/android/media/tv/TvContract.Channels.html#COLUMN_APP_LINK_INTENT_URI),
+Android Television device implementations SHOULD support
+[TV input app linking](http://developer.android.com/reference/android/media/tv/TvContract.Channels.html#COLUMN_APP_LINK_INTENT_URI),
which allows all inputs to provide activity links from the current activity to
-another activity (i.e. a link from live programming to related content).
-* [C-1-2] The TV App MUST show TV input app linking when it is provided.
+another activity (i.e. a link from live programming to related content). The TV
+App SHOULD show TV input app linking when it is provided.
#### 3.12.1.4\. Time shifting
@@ -104,6 +100,3 @@
https://developer.android.com/reference/android/media/tv/TvContract.Programs.html#COLUMN_RECORDING_PROHIBITED),
the EPG MAY provide a way to [record a program](
https://developer.android.com/reference/android/media/tv/TvInputInfo.html#canRecord%28%29).
-
-* SHOULD provide a user interface to play recorded
-programs.
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..751e37c
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+gdimino@google.com
+vikasmarwaha@google.com
+unsuk@google.com
+claym@google.com
+sachiyo@google.com