Merge commit '15233393b0f06894e2ee25e96326d3289905fedf' into manual_merge_15233393b0f06894e2ee25e96326d3289905fedf

Resolve merge conflicts of 15233393b0f06894e2ee25e96326d3289905fedf into nougat-mr1-dev

Change-Id: I3dc3efb4b5bb8445accd2aa809d4b784b67e6b77

Merge "CDD:  Update the requirement condition to require supporting the `android.settings.ACTION_VOICE_INPUT_SETTINGS` settings intent for devices that support VoiceInteractionService." into nougat-dev

CDD:  Update the requirement condition to require supporting the
`android.settings.ACTION_VOICE_INPUT_SETTINGS` settings intent for
devices that support VoiceInteractionService.

Bug: 22388151
Change-Id: Ie55da8d4f2654ee14cbd16ff91980630a10add97

Merge "CDD: Relax CDD for activity switching." into nougat-mr1-dev

CDD: Relax CDD for activity switching.

The number of displayed activities requirement has been relaxed from 20
to 6, as supporting less than 20 activities is not breaking apps, is better
for low memory devices, and finally this allows for more flexible UI choices.

Bug: 32839572
Change-Id: Ied279c85feb239c781c100cb60ebb59df95b6505

Merge "CDD: Remove physical display size requirement from VR High Performance." into nougat-dev
am: cae8481f23

Change-Id: Idb3db39a5e0312840ed85bc95185f233525026cc

Merge "CDD: Remove physical display size requirement from VR High Performance." into nougat-dev

Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev
am: ce7f9a307d

Change-Id: I7c198f9c4373ebdf77383c93726695c89c8b9e3a

Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev

Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev
am: 472ba43619

Change-Id: I1be94b33cb153d50df480ffed28413fc97ea3082

Merge "CDD: Relax CDD section 7.2.3 visibility requirement for nav functions" into nougat-dev

resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic97f35757d2129f4b0e4ff09e1b22faca3f5698c

CDD: Relax CDD section 7.2.3 visibility requirement for nav functions

- This update is only to relax the visibility of the nav buttons but
not to remove the nav functions.
- When nav bars are invisible, require to provide clear guidance
for the user.

Bug: 64997502
Change-Id: I8b7b72a546e364d150da272ce247e9e1896e7317

Docs: New version of CDD build script and helper shell script.

Test: ./cdd_gen.sh --version 7.0 --branch nougat-dev

Change-Id: Iac39d587433afcd843631cbc0da0c5854f882018

CDD: Remove physical display size requirement from VR High Performance.

Bug:67383027
Test:N/A
Change-Id: I59bb1ce24537746d4c2951ccc7b4214f56927023

CDD: Relax CDD to allow device owner migration path for proprietary
device admins.

Bug: 67739177
Test: N/A
Change-Id: I110df3107c8ca3a04de5886eccb08a6b25791d18

Merge "CDD: Allow display density to change, but require a fixed value for DENSITY_DEVICE_STABLE." into nougat-dev
am: cdd069781b

Change-Id: I43c0680cc44ff0c12b81e29c8fd9e4f74df3c531

Merge "CDD: Allow display density to change, but require a fixed value for DENSITY_DEVICE_STABLE." into nougat-dev

CDD: Allow display density to change, but require a fixed value
for DENSITY_DEVICE_STABLE.

While the Android framework can scale the resources across different
density buckets now, the app distribution service that is preinstalled
might benefit from knowing the device's native density to filter and
allow downloads of the proper apks.

Bug: 27669029
Change-Id: I3ef5cd319c420b21c5a8cd85cc31dfa6ef3d4e66

Merge "CDD: "Clarify what are the conditions to be met in order       to be classified as hadware backed and secure hardware"." into nougat-dev
am: 5deade678c

Change-Id: I9ba5054974bd9b04ce5061a00cf6977a7dd6527e

Merge "CDD: "Clarify what are the conditions to be met in order       to be classified as hadware backed and secure hardware"." into nougat-dev

CDD: "Clarify what are the conditions to be met in order
      to be classified as hadware backed and secure hardware".

Bug: 34343011
Change-Id: Iae36445e9eaad40704ab500d26cab4b94d8dd592

CDD: Update Remote Control Req for Android Television devices that support an assistant.
am: 88cb5985df

Change-Id: I076b980995dc920d63b400ae9c80d38f0f7dba66

CDD: Update Remote Control Req for Android
Television devices that support an assistant.

Bug: 62236250
Change-Id: Ie9b29f9873087d779bea4e01597c40e7ff7ef933

CDD: Added additional screen densities.

Added additional screen densities as definied in the developer
page https://developer.android.com/reference/android/util/DisplayMetrics.html.

Bug: 34201954
Change-Id: Ib2a2c07c20500d8f8df1281b406842c07f380fb1

Docs: Remove files from bad commit.

Bug: None
Change-Id: I3a419b0b24632f9c04eb94664973240545c173de
Tests: None

Docs: Move the contents of source dir from SAC component.

Test: None

Bug: None
Change-Id: Ic313d2e2941f5e788c806514f577efc340ba7864

Holding tank for these files.

Change-Id: Ia6cc85f4c4d53d36f58879cd19ad0477654ea8e3

Merge remote-tracking branch 'aosp/nougat-dev' into HEAD

CDD: Relax CDD 3.8.3 for DND Rules.

Relaxing CDD for DND as only supported for UI_MODE_TYPE_NORMAL see
https://developer.android.com/reference/android/provider/Settings.html#ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS
and  https://developer.android.com/reference/android/app/NotificationManager.html#addAutomaticZenRule

Bug: 35325689
Change-Id: Ifd8e37a7e0c55826626adadc38d567dd78881d6a

Merge "CDD: Clarify that when we require the new v2 signing, it doesn't remove      the jar signing support.            JAR signing has been always supported and from Android N onwards,      APK Signature Scheme v2 support was added. So requiring support      for both." into nougat-mr1-dev

Merge "CDD: Clarify the location where the Security Patch level's      are declared." into nougat-mr1-dev

Merge "CDD: Clarified hardware-backed keystore requirement." into nougat-mr1-dev

Merge "CDD: Clarify the charging specs to refer when a USB type C port." into nougat-mr1-dev

Merge "CDD: Updated section related to screen aspect ratio." into nougat-mr1-dev

Merge "Revert "Revert "CDD: Relax Overview title count requirement.""" into nougat-mr1-dev

Revert "Revert "CDD: Relax Overview title count requirement.""

This reverts commit d1e913ce39953a030a9d7ed5c6ab85ba329fbb0b.

Change-Id: I36ba5bbbb49e91ab1338e517a9c86511c0e02574

Merge "Revert "Revert "CDD: Relax VR high performance requirement related to exclusive cores.""" into nougat-mr1-dev

Revert "Revert "CDD: Relax VR high performance requirement related to exclusive cores.""

This reverts commit a348d1a788a51df7a06892afff2e96d6d852f946.

Change-Id: Id5690a8cf6940dc078443926adaacd33421f43fc

Merge "Revert "CDD: Relax VR high performance requirement related to exclusive cores."" into nougat-mr1-dev

Revert "CDD: Relax VR high performance requirement related to exclusive cores."

This reverts commit 4dc2d9510a05582086702f39a8cdf5b474c6e357.

Change-Id: I8713e8226889f4a1e34a31ad43a62453e9e4d3c3

CDD: Clarify that when we require the new v2 signing, it doesn't remove
     the jar signing support.
     
     JAR signing has been always supported and from Android N onwards,
     APK Signature Scheme v2 support was added. So requiring support
     for both.


Bug: 31497277
Change-Id: If8554d0b388374fd8e60a823ad952faf686c7320

CDD: Clarify the location where the Security Patch level's
     are declared.

Bug: 28090724
Change-Id: Ic16983e836261638f03f53bc7801119e5e65b545

Merge "Revert "CDD: Relax Overview title count requirement."" into nougat-mr1-dev

Revert "CDD: Relax Overview title count requirement."

This reverts commit 63b2c7936483a7a05b473f0852865d14dd7ea053.

Change-Id: Id75f548e491d7da032e74c728d51a837394f481f

CDD: Clarified hardware-backed keystore requirement.

Bug: 35126445
Change-Id: Ie6ebddc9e242ab3bb508235a49d210dcbeed21a6
(cherry picked from commit 82acfb1241373cfe6f59a88a7f10b24d3c26c95a)

CDD: Clarify the charging specs to refer when a USB type C port.

Bug: 24936153
Change-Id: I56c85377f27e657335108383aabfb3b8e0d61718
(cherry picked from commit 02d3ce7abe74c28cf075e5b73217c5b0a5618f82)

CDD: Updated section related to screen aspect ratio.

Bug: 27694834
Change-Id: Idd6172e2ecf3cb5006200def4b30cce8b3d9b187
(cherry picked from commit 809ecc61b7c1d1d355a38f113616f9cf4d211efc)

Merge "CDD: Updated section related to screen aspect ratio." into nougat-dev

CDD: Updated section related to screen aspect ratio.

Bug: 27694834
Change-Id: Idd6172e2ecf3cb5006200def4b30cce8b3d9b187

Merge "CDD: Relax CDD 3.8.3 for DND Rules." into nougat-dev

CDD: Relax CDD 3.8.3 for DND Rules.

Relaxing CDD for DND as only supported for UI_MODE_TYPE_NORMAL see
https://developer.android.com/reference/android/provider/Settings.html#ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS
and  https://developer.android.com/reference/android/app/NotificationManager.html#addAutomaticZenRule

Bug: 35325689
Change-Id: Ifd8e37a7e0c55826626adadc38d567dd78881d6a

Merge "CDD: Clarified hardware-backed keystore requirement." into nougat-dev

Merge "CDD: Clarify the location where the Security Patch level's      are declared." into nougat-dev

Merge "CDD: Clarify the charging specs to refer when a USB type C port." into nougat-dev

CDD: Relax CDD for activity switching.

The number of displayed activities requirement has been relaxed from 20
to 6, as supporting less than 20 activities is not breaking apps, is better
for low memory devices, and finally this allows for more flexible UI choices.

Bug: 32839572
Change-Id: Ied279c85feb239c781c100cb60ebb59df95b6505

CDD: Clarify the charging specs to refer when a USB type C port.

Bug: 24936153
Change-Id: I56c85377f27e657335108383aabfb3b8e0d61718

CDD: Clarify the location where the Security Patch level's
     are declared.

Bug: 28090724
Change-Id: Ic16983e836261638f03f53bc7801119e5e65b545

CDD: Clarified hardware-backed keystore requirement.

Bug: 35126445
Change-Id: Ie6ebddc9e242ab3bb508235a49d210dcbeed21a6

CDD: Clarify that when we require the new v2 signing, it doesn't remove
     the jar signing support.
     
     JAR signing has been always supported and from Android N onwards,
     APK Signature Scheme v2 support was added. So requiring support
     for both.


Bug: 31497277
Change-Id: If8554d0b388374fd8e60a823ad952faf686c7320

Docs: Add CURRENT_BRANCH variable and code.

Use a variable CURRENT_BRANCH to designate the AOSP branch to use for
the changelog.  Update code to make the substitution.

Bug: 34106192
Test: python make_cdd.py --version 7.1 --branch nougat-mr1-dev

Change-Id: Ia68946b91e61129929dd0dfb91d495d3c53b095b

Merge "CDD: Relax VR high performance requirement related to exclusive cores." into nougat-mr1-dev

CDD: Relax VR high performance requirement related to exclusive cores.

Some device implementation have been proven to work better without
using exclusive cores but only by utilizing SCHED_FIFO properly.

Bug:34973979
Change-Id: I99358bc41d6809ac30b85d168239be7b34e95774
(cherry picked from commit eaacee40da6640ebf90ca383ac5d7ab86fca1359)

CDD: Relax Overview title count requirement.

Bug: 30158997
Change-Id: I5a7513033be76c3be78628026baf04b2cdf2e9a6

CDD: Recommend UI for when visual effects are suppressed in DND.

Not a mandatory requirement but only a recommendation as the
user may be confused if an app has turned off the visual effects.

Bug: 32182431
Change-Id: Ib74c583b3a53b410e7bf5b5b70de0f39a08f9df3

CDD: Typo 'libvukan.so' should be 'libvulkan.so.

Bug: 34112761

Change-Id: Id8a140e29d59bdf290d55c66d2138627c517b485

CDD: Hi-Fi sensors, gyroscope noise density typo fix

Updated CDD section 7.3.9 to correctly state 0.007 °/s/√Hz,
instead of 0.07 °/s/√Hz

Bug: 34094339

Change-Id: Ie9bd52b20d46574ad51c441daa0b1f104a74d489

CDD: Minor typo in  Section 3.3

Bug: 27614718
Change-Id: I343aee9f00c664b51c22b638b1904dc31af34364
(cherry picked from commit 7ca39bee5230feeb076e0207665ce8b58450d80a)

CDD: Clarify that the AOSP implementation of TEE is a preferred reference
Section: 7.3.10. Fingerprint Sensor

The following requirement, has occassionaly been read that the use of
the AOSP implementation of the TEE is mandated.

"MUST prevent adding a fingerprint without first establishing a chain
of trust by having the user confirm existing or add a new device
credential (PIN/pattern/password) using the TEE as implemented in the
Android Open Source project"

Clarifed that there is an implementation of the TEE in the AOSP that
meets the requirement, and not that it is the only allowed
implementation.

Bug: 25121419
Change-Id: I19bf5535b7a532e52975fe99fceab5706be9f74b
(cherry picked from commit 32269fc2a910ea40d73fc4d67e929cfc7e6ca1fe)

Merge "CDD: Relax H.265 1080p requirements from 10Mbps to 5Mbps" into nougat-mr1-dev

CDD: Section 3.8.2 mistakenly included bullets for Section 3.8.8.

Bug: 33130492
Change-Id: I05109e9487c195fe8251164cd5a70557bf9a1cbe

CDD: Relax H.265 1080p requirements from 10Mbps to 5Mbps

The 10Mbps was too strict for the industry to implement
widely enough.

http://r.android.com/209496 should have updated both VP9
and H.265 requirements but missed the H.265.

Bug: 27664397
Change-Id: I953b1f8534ee005e61971d866fea817e8ded9315
(cherry picked from commit 84b35c7bb6a3642a1ea06343d5b123b580bf86ec)

CDD: Relax VR high performance requirement related to exclusive cores.

Some device implementation have been proven to work better without
using exclusive cores but only by utilizing SCHED_FIFO properly.

Bug:34973979
Change-Id: I99358bc41d6809ac30b85d168239be7b34e95774

Merge "CDD: Fix typo in high frequency range for unprocessed audio" into nougat-mr1-dev

Docs: Final cleanup for CDD source.

   - Fix rowspan in table in section 2.1.
   - Put markdown links on a single line.
   - Escape parentheses in URLs.
   - Fix some internal links with dashes instead of underscores.
   - Replace tabs with spaces.
   - Other misc. cleanup.

Bug: 32070486
Change-Id: Ie44202b5a0bfe7133505880a0a9c74f08a9bac1f

CDD: Fix typo in high frequency range for unprocessed audio

Test: not applicable
Bug: 32645111
Change-Id: Ia35f0871b674976476358dd84d1ab019d19152fb
(cherry picked from commit 852dbf00119545bb398b2c9821d2b866d8a89bce)

CDD: Hi-Fi sensors, gyroscope noise density typo fix

Updated CDD section 7.3.9 to correctly state 0.007 °/s/√Hz,
instead of 0.07 °/s/√Hz

Bug: 34094339

Change-Id: Ie9bd52b20d46574ad51c441daa0b1f104a74d489

Merge "CDD: Clarify that the AOSP implementation of TEE is a preferred reference Section: 7.3.10. Fingerprint Sensor" into nougat-dev

CDD: Typo 'libvukan.so' should be 'libvulkan.so.

Bug: 34112761

Change-Id: Id8a140e29d59bdf290d55c66d2138627c517b485

CDD: Recommend UI for when visual effects are suppressed in DND.

Not a mandatory requirement but only a recommendation as the
user may be confused if an app has turned off the visual effects.

Bug: 32182431
Change-Id: Ib74c583b3a53b410e7bf5b5b70de0f39a08f9df3

Merge "CDD:  Clarify that the system privileged permissions are not granted       to all apps on the system image." into nougat-dev

Merge "CDD: Minor typo in  Section 3.3" into nougat-dev

CDD: Relax Overview title count requirement.

Bug: 30158997
Change-Id: I5a7513033be76c3be78628026baf04b2cdf2e9a6

Merge "CDD: Section 3.8.2 mistakenly included bullets for Section 3.8.8." into nougat-dev

CDD: Relax H.265 1080p requirements from 10Mbps to 5Mbps

The 10Mbps was too strict for the industry to implement
widely enough.

http://r.android.com/209496 should have updated both VP9
and H.265 requirements but missed the H.265.

Bug: 27664397
Change-Id: I953b1f8534ee005e61971d866fea817e8ded9315

CDD:  Clarify that the system privileged permissions are not granted
      to all apps on the system image.

Since Android 6.0, as already documented in the SDK (https://developer.android.com/reference/android/content/pm/PermissionInfo.html#PROTECTION_FLAG_SYSTEM),
not all apps in the system image are granted privilged permissions.
This requirements clarifies what mechanism would be used to implement
what is described in the SDK.

BUG: 33111571
Change-Id: Ia9b78470d764e105cb6c7e0c76a163050ace2e99

CDD: Clarify that the AOSP implementation of TEE is a preferred reference
Section: 7.3.10. Fingerprint Sensor

The following requirement, has occassionaly been read that the use of
the AOSP implementation of the TEE is mandated.

"MUST prevent adding a fingerprint without first establishing a chain
of trust by having the user confirm existing or add a new device
credential (PIN/pattern/password) using the TEE as implemented in the
Android Open Source project"

Clarifed that there is an implementation of the TEE in the AOSP that
meets the requirement, and not that it is the only allowed
implementation.

Bug: 25121419
Change-Id: I19bf5535b7a532e52975fe99fceab5706be9f74b

Merge "CDD: Require settings menu to select default assistant." into nyc-mr1-dev

CDD: Require settings menu to select default assistant.

Bug: 22388151
Change-Id: I5789f1a8abe71bbd4e4fc3799eda43f8c6832584

CDD: Device requirements for preinstalled apps using assist.

Bug: 33303919
Change-Id: Ib27219a4430598d90cecc122b4e554dea7816ee4

CDD: Minor typo in  Section 3.3

Bug: 27614718
Change-Id: I343aee9f00c664b51c22b638b1904dc31af34364

CDD: Section 3.8.2 mistakenly included bullets for Section 3.8.8.

Bug: 33130492
Change-Id: I05109e9487c195fe8251164cd5a70557bf9a1cbe

Merge "CDD: Preinstalled assistant apps specific requirements related to      context sharing indication." into nyc-mr1-dev

CDD: Preinstalled assistant apps specific requirements related to
     context sharing indication.

BUG: 33303919
Change-Id: I501acef09e459ceb2db3ad312c6c0845b93bc688

Merge "CDD: Behavioral changes in N, for an app with DELETE_PACKAGES permission      trying to delete a package." into nyc-mr1-dev

Merge "CDD: Require Notification management API's to match the SDK." into nyc-mr1-dev

Merge "CDD: Functionality to provide encryption support." into nyc-mr1-dev

CDD: Behavioral changes in N, for an app with DELETE_PACKAGES permission
     trying to delete a package.

BUG: 31828055
Change-Id: I10cbef8d576e0b9fa1cab5471c1156db6ee524ce

Merge "CDD: Fix a typo for HIGH FI sensor requirements (gyro)" into nyc-mr1-dev

Merge "CDD: Recommend A/B system update support" into nyc-mr1-dev