release-request-377d229e-edf2-40bb-b588-f87e3dc9f3a7-for-git_oc-dr1-release-4265721 snap-temp-L12600000091924087android-8.0.0_r34android-8.0.0_r33android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: Ibef803de6562804571bd69d1ed25b741061d0e9b

9 files changed, 8 insertions, 132 deletions

diff --git a/3_software/3_10_accessibility.md b/3_software/3_10_accessibility.md
index 228f332..6d92e24 100644
--- a/3_software/3_10_accessibility.md
+++ b/3_software/3_10_accessibility.md
@@ -6,19 +6,6 @@ that enable accessibility service implementations to receive callbacks for user
 and system events and generate alternate feedback mechanisms, such as
 text-to-speech, haptic feedback, and trackball/d-pad navigation.
 
-*   [H-SR] Android Handheld device implementations MUST support third-party
-    accessibility services.
-
-*   [W-SR] Android Watch device implementations that declare the
-    `android.hardware.audio.output` feature flag MUST support third-party
-    accessibility services.
-
-*   [T-SR] Android Television device implementations MUST support third-party
-    accessibility services.
-
-*   [A-SR] Android Automotive implementations are STRONGLY RECOMMENDED to
-    support third-party accessibility services.
-
 If device implementations support third-party accessibility services, they:
 
 *   [C-1-1] MUST provide an implementation of the Android accessibility
@@ -40,22 +27,6 @@ If device implementations support third-party accessibility services, they:
     requirement is not applicable, but device implementations SHOULD provide a
     user affordance to control these accessibility services.
 
-*   [H-SR] Android Handheld device implementations are STRONGLY RECOMMENDED to
-  preload accessibility services on the device comparable with or exceeding
-  functionality of the Switch Access and TalkBack (for languages supported by
-  the preloaded Text-to-speech engine) accessibility services as provided in
-  the [talkback open source project](https://github.com/google/talkback).
-*   [T-SR] Android Television device implementations are STRONGLY RECOMMENDED to
-  preload accessibility services on the device comparable with or exceeding
-  functionality of the Switch Access and TalkBack (for languages supported by
-  the preloaded Text-to-speech engine) accessibility services as provided in
-  the [talkback open source project](https://github.com/google/talkback).
-*   [W-SR] Android Watch device implementations that declare `android.hardware.
-  audio.output` are STRONGLY RECOMMENDED to preload accessibility services on
-  the device comparable with or exceeding functionality of the Switch Access and
-  TalkBack (for languages supported by the preloaded Text-to-speech engine)
-  accessibility services as provided in the [talkback open source project](
-  https://github.com/google/talkback).
 
 If device implementations include preloaded accessibility services, they:
 
diff --git a/3_software/3_11_text-to-speech.md b/3_software/3_11_text-to-speech.md
index d0b2ec3..0774b7b 100644
--- a/3_software/3_11_text-to-speech.md
+++ b/3_software/3_11_text-to-speech.md
@@ -16,13 +16,3 @@ If device implementations support installation of third-party TTS engines, they:
 *   [C-2-1] MUST provide user affordance to allow the user to select a TTS
     engine for use at system level.
 
-*   [H-0-1] STRONGLY RECOMMENDED to include a TTS engine supporting the
-    languages available on the device.
-*   [W-0-1] STRONGLY RECOMMENDED to include a TTS engine supporting the
-    languages available on the device.
-*   [T-0-1] STRONGLY RECOMMENDED to include a TTS engine supporting the
-    languages available on the device.
-
-*   [H-0-2] MUST support installation of third-party TTS engines.
-*   [W-0-2] MUST support installation of third-party TTS engines.
-*   [T-0-2] MUST support installation of third-party TTS engines.
\ No newline at end of file
diff --git a/3_software/3_13_quick-settings.md b/3_software/3_13_quick-settings.md
index a38f42c..d2ff570 100644
--- a/3_software/3_13_quick-settings.md
+++ b/3_software/3_13_quick-settings.md
@@ -3,9 +3,6 @@
 Android provides a Quick Settings UI component that allows quick access to
 frequently used or urgently needed actions.
 
-*    [H-SR] Android Handheld devices are STRONGLY RECOMMENDED to include a
-     Quick Settings UI component
-
 If device implementations include a Quick Settings UI component, they:
 
 *    [C-1-1] MUST allow the user to add or remove the tiles provided through the
diff --git a/3_software/3_14_vehicle-ui-apis.md b/3_software/3_14_vehicle-ui-apis.md
index d8c06a0..b576593 100644
--- a/3_software/3_14_vehicle-ui-apis.md
+++ b/3_software/3_14_vehicle-ui-apis.md
@@ -1,9 +1,5 @@
 ## 3.14\. Media UI
 
-Any device implementation that [declares automotive support](https://developer.android.com/reference/android/content/pm/PackageManager.html?#FEATURE_AUTOMOTIVE)
-
-*    [A-0-1] Automotive implementations MUST include a UI framework to support
-third-party apps using the media APIs as described in section 3.14.
 
 If device implementations include the UI framework that supports third-party
 apps that depend on [`MediaBrowser`](
@@ -20,4 +16,4 @@ http://developer.android.com/reference/android/media/session/MediaSession.html)
 *    [C-1-3] MUST show app title.
 *    [C-1-4] MUST have drawer to present [MediaBrowser](
      http://developer.android.com/reference/android/media/browse/MediaBrowser.html)
-     hierarchy.
\ No newline at end of file
+     hierarchy.
diff --git a/3_software/3_15_instant-apps.md b/3_software/3_15_instant-apps.md
index d0fe3a7..f8d290f 100644
--- a/3_software/3_15_instant-apps.md
+++ b/3_software/3_15_instant-apps.md
@@ -2,16 +2,16 @@
 
 Device implementations MUST satisfy the following requirements:
 
-*   Instant Apps MUST only be granted permissions that have the
+*   [C-0-1] Instant Apps MUST only be granted permissions that have the
     [`android:protectionLevel`](https://developer.android.com/guide/topics/manifest/permission-element.html#plevel)
     set to `"ephemeral"`.
-*   Instant Apps MUST NOT interact with installed apps via [implicit intents](https://developer.android.com/reference/android/content/Intent.html)
+*   [C-0-2] Instant Apps MUST NOT interact with installed apps via [implicit intents](https://developer.android.com/reference/android/content/Intent.html)
     unless one of the following is true:
     *   The component's intent pattern filter is exposed and has CATEGORY_BROWSABLE
     *   The action is one of ACTION_SEND, ACTION_SENDTO, ACTION_SEND_MULTIPLE
     *   The target is explicitly exposed with [android:visibleToInstantApps](https://developer.android.com/reference/android/R.attr.html#visibleToInstantApps)
-*   Instant Apps MUST NOT interact explicitly with installed apps unless the
+*   [C-0-3] Instant Apps MUST NOT interact explicitly with installed apps unless the
     component is exposed via android:visibleToInstantApps.
-*   Installed Apps MUST NOT see details about Instant Apps on the
+*   [C-0-4] IInstalled Apps MUST NOT see details about Instant Apps on the
     device unless the Instant App explicitly connects to the
     installed application.
diff --git a/3_software/3_15_companion_device_pairing.md b/3_software/3_16_companion_device_pairing.md
index 1bf9209..cd71a08 100644
--- a/3_software/3_15_companion_device_pairing.md
+++ b/3_software/3_16_companion_device_pairing.md
@@ -1,14 +1,10 @@
-## 3.15\. Companion Device Pairing
+## 3.16\. Companion Device Pairing
 
 Android includes support for companion device pairing to more effectively manage
 association with companion devices and provides the [`CompanionDeviceManager`
 ](https://developer.android.com/reference/android/companion/CompanionDeviceManager.html)
 API for apps to access this feature.
 
-If handheld devices declare `FEATURE_BLUETOOTH` or `FEATURE_WIFI` support, they:
-
-*    [H-1-1] MUST also support the companion device pairing feature.
-
 If device implementations support the companion device pairing feature, they:
 
 *   [C-1-1] MUST declare the feature flag [`FEATURE_COMPANION_DEVICE_SETUP`
diff --git a/3_software/3_4_web-compatibility.md b/3_software/3_4_web-compatibility.md
index eec4ecd..a09fb0b 100644
--- a/3_software/3_4_web-compatibility.md
+++ b/3_software/3_4_web-compatibility.md
@@ -2,15 +2,6 @@
 
 ### 3.4.1\. WebView Compatibility
 
-*    [H-0-1] Handheld devices MUST provide a complete implementation of the
-     android.webkit.Webview API.
-
-*    [T-0-1] Television devices MUST provide a complete implementation of the
-     android.webkit.Webview API.
-
-*    [A-0-1] Automobile devices MUST provide a complete implementation of the
-     android.webkit.Webview API.
-
 If device implementations provide a complete implementation of the
 `android.webkit.Webview` API, they:
 
@@ -43,9 +34,6 @@ If device implementations provide a complete implementation of the
 
 ### 3.4.2\. Browser Compatibility
 
-*    [H-0-1] Handheled device implementations MUST include a standalone Browser
-     application for general user web browsing.
-
 If device implementations include a standalone Browser application for general
 web browsing, they:
 
diff --git a/3_software/3_8_user-interface-compatibility.md b/3_software/3_8_user-interface-compatibility.md
index 3b74b13..9b1fe63 100644
--- a/3_software/3_8_user-interface-compatibility.md
+++ b/3_software/3_8_user-interface-compatibility.md
@@ -15,9 +15,6 @@ If device implementations allow third-party applications to replace the device h
     https://developer.android.com/reference/android/content/pm/PackageManager.html)
     methods to retrieve icons are called.
 
-*   [H-SR] Handheld device implementations are STRONGLY RECOMMENDED to implement a default launcher
-    that supports in-app pinning of shortcuts and widgets.
-
 If device implementations include a default launcher that supports in-app pinning of shortcuts and
 widgets, they:
 
@@ -41,11 +38,6 @@ Conversely, if device implementations do not support in-app pinning, they:
     and [`AppWidgetManager.html#isRequestPinAppWidgetSupported()`](
     https://developer.android.com/reference/android/appwidget/AppWidgetManager.html#isRequestPinAppWidgetSupported%28%29).
 
-*   [H-SR] Device implementations are STRONGLY RECOMMENDED to implement a default launcher that
-    provides quick access to the additional shortcuts provided by third-party apps through the
-    [ShortcutManager](
-    https://developer.android.com/reference/android/content/pm/ShortcutManager.html) API.
-
 If device implementations implement a default launcher that provides quick access to the additional
 shortcuts provided by third-party apps through the [ShortcutManager](
 https://developer.android.com/reference/android/content/pm/ShortcutManager.html) API, they:
@@ -56,9 +48,6 @@ https://developer.android.com/reference/android/content/pm/ShortcutManager.html)
     https://developer.android.com/reference/android/content/pm/ShortcutManager.html)
     API class.
 
-*   [H-SR] Handheld devices are STRONGLY RECOMMENDED to include a default
-    launcher app that shows badges for the app icons.
-
 If device implementations include a default launcher app that shows badges for
 the app icons, they:
 
@@ -86,8 +75,6 @@ corresponding API and lifecycle that allows applications to expose an
 [“AppWidget”](http://developer.android.com/guide/practices/ui_guidelines/widget_design.html)
 to the end user.
 
-*   [H-SR] Handheld Device implementations are STRONGLY RECOMMENDED to support
-    third-party app widgets.
 
 If device implementations support third-party app widgets, they:
 
@@ -114,27 +101,6 @@ device.
 
 #### 3.8.3.1\. Presentation of Notifications
 
-Android Handheld device implementations:
-
-*   [H-0-1] MUST allow third-party apps to notify users
-    of notable events through the [`Notification`](
-    https://developer.android.com/reference/android/app/Notification.html) and
-    [`NotificationManager`](
-    https://developer.android.com/reference/android/app/NotificationManager.html)
-    API classes.
-*   [H-0-2] MUST support rich notifications.
-*   [H-0-3] MUST support heads-up notifications.
-*   [H-0-4] MUST include a notification shade, providing the user the ability
-    to directly control (e.g. reply, snooze, dismiss, block) the notifications
-    through user affordance such as action buttons or the control panel as
-    implemented in the AOSP.
-
-Android Automotive implementations:
-
-*   [A-0-1] MUST display notifications that use the [`Notification.CarExtender`](
-    https://developer.android.com/reference/android/app/Notification.CarExtender.html)
-    API when requested by third-party applications.
-
 If device implementations allow third party apps to [notify users of notable events](
 http://developer.android.com/guide/topics/ui/notifiers/notifications.html), they:
 
@@ -249,18 +215,6 @@ allow developers to supply results to the common global search user interface.
 system-wide search user interface capable of real-time suggestions in response
 to user input.
 
-*   [H-SR] Handheld device implementations are STRONGLY RECOMMENDED to implement
-    an assistant on the device to handle the [Assist action](
-    http://developer.android.com/reference/android/content/Intent.html#ACTION_ASSIST).
-
-*   [W-SR] Watch device implementations are STRONGLY RECOMMENDED to implement
-    an assistant on the device to handle the [Assist action](
-    http://developer.android.com/reference/android/content/Intent.html#ACTION_ASSIST).
-
-*   [A-0-1] Android Automotive implementations MUST implement an assistant on
-    the device to handle the [Assist action](
-    http://developer.android.com/reference/android/content/Intent.html#ACTION_ASSIST).
-
 If device implementations implement the global search interface, they:
 
 *   [C-1-1] MUST implement the APIs that allow third-party applications to add
@@ -453,13 +407,6 @@ The Remote Control Client API is deprecated from Android 5.0 in favor of the
 that allows media applications to integrate with playback controls that are
 displayed on the lock screen.
 
-If Android Handheld device implementations support a lock screen,they:
-
-*   [H-1-1] MUST display the Lock screen Notifications including the Media Notification Template.
-
-If Android Television device implementations support a lock screen,they:
-
-*   [T-1-1] MUST display the Lock screen Notifications including the Media Notification Template.
 
 ### 3.8.11\. Screen savers (previously Dreams)
 
@@ -506,9 +453,6 @@ If device implementations include an IME, they:
 
 ### 3.8.14\. Multi-windows
 
-*   [T-SR] Android Television device implementations are STRONGLY RECOMMENDED to
-    support picture-in-picture (PIP) mode multi-window.
-
 If device implementations have the capability to display multiple activities at
 the same time, they:
 
@@ -575,4 +519,4 @@ multi-window mode, they:
 *   [C-3-6] MUST allocate minimum width and height of 108 dp for the PIP window
     and minimum width of 240 dp and height of 135 dp for the PIP window when the
     `Configuration.uiMode` is configured as [`UI_MODE_TYPE_TELEVISION`](
-    https://developer.android.com/reference/android/content/res/Configuration.html#UI_MODE_TYPE_TELEVISION)
\ No newline at end of file
+    https://developer.android.com/reference/android/content/res/Configuration.html#UI_MODE_TYPE_TELEVISION)
diff --git a/3_software/3_9_device-administration.md b/3_software/3_9_device-administration.md
index 5ebed6a..6310bdf 100644
--- a/3_software/3_9_device-administration.md
+++ b/3_software/3_9_device-administration.md
@@ -5,12 +5,6 @@ device administration functions at the system level, such as enforcing password
 policies or performing remote wipe, through the
 [Android Device Administration API](http://developer.android.com/guide/topics/admin/device-admin.html)].
 
-If Handheld device implementations support a secure lock screen, they:
-
-*   [H-1-1] MUST implement the full range of [device administration](
-http://developer.android.com/guide/topics/admin/device-admin.html)
-policies defined in the Android SDK documentation.
-
 If device implementations implement the full range of [device administration](
 http://developer.android.com/guide/topics/admin/device-admin.html)
 policies defined in the Android SDK documentation, they:
@@ -149,4 +143,4 @@ If device implementations declare `android.software.managed_users`, they:
 *   When contacts from the managed profile are displayed
     in the preinstalled call log, in-call UI, in-progress and missed-call
     notifications, contacts and messaging apps they SHOULD be badged with the
-    same badge used to indicate managed profile applications.
\ No newline at end of file
+    same badge used to indicate managed profile applications.