Merge tag 'android-6.0.0_r26' into r1
Android 6.0.0 release 26
Force reset to android-6.0.0_r26 to eliminate deviations:
renamed: tests/tests/netlegacy22/api/Android.mk -> tests/netlegacy22.api/Android.mk
deleted: tests/tests/netlegacy22/permission/Android.mk
deleted: tests/tests/netlegacy22/permission/AndroidManifest.xml
deleted: tests/tests/netlegacy22/permission/src/android/net/cts/legacy/api22/permission/ConnectivityManagerPermissionTest.java
deleted: tests/tests/netlegacy22/permission/src/android/net/cts/legacy/api22/permission/NoNetworkStatePermissionTest.java
* tag 'android-6.0.0_r26': (239 commits)
Camera: improve Image allocation in camera CTS
DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures
Refactored "Audio Devices Notifications" and "Audio Routing Notifications" testing into separate Input & Output flavors.
disabled protected broadcast
Fix android.print test to skip when feature is missing
Revert "Separating phone and telecom specific protected broadcasts. Bug: 23192492"
Separating phone and telecom specific protected broadcasts. Bug: 23192492
Separating phone and telecom specific protected broadcasts. Bug: 23192492
DO NOT MERGE CTS version is now 6.0_r1
Separating phone and telecom specific protected broadcasts. Bug: 23192492
added back adopthost test removed video encoding test.
Add whitelists for known address, port, and UID combinations Bug: 19461976
Save expected audio route for speaker tests, but disable for now
bug: 21208382
[cts] fix build break
BUG: 21262226,23979591,23040468,23144425
Fix android.text.format.cts.DateUtilsTest#test_getRelativeTimeSpanString
cts: Check for video codec on some MediaRecorder Tests
Add density requirements for watches
DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""
...
Change-Id: I781414a4314a2d42fcc4530243098a117552a25d