Android Build Merger (Role)
0569ab366c
Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: 0170919a9b" into nyc-mr2-dev-plus-aosp
2016-12-16 22:43:09 +00:00
Yu Liu
1087edb3a9
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5
...
am: 0170919a9b
2016-12-16 22:42:52 +00:00
Yu Liu
56ba301912
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5
...
am: e19332fe41
Change-Id: I62c44da71daaf577893b67feb31ecf422ec42531
2016-12-16 22:42:39 +00:00
Yu Liu
0170919a9b
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b
...
am: d7f8755fd5
2016-12-16 22:34:37 +00:00
Yu Liu
d7f8755fd5
merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe
...
am: 7cd9930f4b
2016-12-16 22:25:38 +00:00
Yu Liu
7cd9930f4b
merge in nyc-mr1-release history after reset to nyc-mr1-dev
...
am: 73eee30ffe
Change-Id: I32635801fa4338f313feef7655c7636253d708d3
2016-12-16 22:17:04 +00:00
Baligh Uddin
79f8094b5f
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
...
am: 3c9b149b01
2016-11-23 18:25:22 +00:00
Baligh Uddin
3c9b149b01
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
...
Bug: 32849428
* goog/cw-f-dev: (122 commits)
Fixed CTS unit tests
Fixing layout of several test suites for round screens.
Fix test case context which is not fully visible on wear.
Fix build for nyc-dr1-dev
Check that H.264 is available before checking max frame rate
DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r14
DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r13
Run DynamicConfig setup twice
DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r4
Fix UserRestrictionsTest.testUserRestrictions_secondaryProfileOwnerOnly
Generate and include checksum data with CTS report submissions Test: Used exploratory tests and unit tests in ChecksumReporterTest.java to verify the behavior. * All TestResults are added from an InvocationResult * Able to verify TestResult against previously calculated checksum * CRCs are created for all files in a directory including subdirectories * Checksum integrity is maintained while serializing to/from disk * When possible checksum data is compressed before report submission
Add retry logic for adoptable storage tests
Catch case where browser is protected by a permission
Fix failure due to accessibility node not updated after scrolling.
Fix DO/PO Wifi CTS
Test: Fix testFindAll result listener not set issue
Updating CTS Security patch to 2017-01
DO NOT MERGE ANYWHERE: bump cts for 201701 security public bulletin
DO NOT MERGE ANYWHERE: bump cts for 201701 security public bulletin
CTS Test for security vulnerability fix: Effect command might allow negative indexes
...
Change-Id: I07b3bb0249eebcae5760d08c98cdde1ac5b01601
2016-11-22 17:13:49 -08:00
Chris Manton
0d2a90581d
Include Wear device idle settings am: c6ce1d051e am: cafa4c9bcc
...
am: a7b24cd740
Change-Id: I5fd8d5cb7743c3ff230e3bd082ed93c5d5ebcdfc
2016-11-10 23:31:37 +00:00
Chris Manton
cafa4c9bcc
Include Wear device idle settings
...
am: c6ce1d051e
2016-11-10 23:18:13 +00:00
Chris Manton
c6ce1d051e
Include Wear device idle settings
...
Certain tests interacting with device idle
must set correctly both the normal and wear
device idle setting space.
Bug: 32183373
Test: Run on wear device and Nexus6P
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeMetered_enabledButWhitelistedOnNotificationAction
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Change-Id: I6a53d29021a7d4a257b102a4d3bd5d2cc845c16f
(cherry picked from commit a84bb771d1
2016-11-09 19:06:25 +00:00
Chris Manton
89b2b0d039
Include Wear device idle settings am: a84bb771d1
...
am: 418581d2aa
Change-Id: Ie5a0640553a9825e41a0ac7defc9564b1beb79e5
2016-11-08 03:53:19 +00:00
Chris Manton
a84bb771d1
Include Wear device idle settings
...
Certain tests interacting with device idle
must set correctly both the normal and wear
device idle setting space.
Bug: 32183373
Test: Run on wear device and Nexus6P
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeMetered_enabledButWhitelistedOnNotificationAction
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Change-Id: I6a53d29021a7d4a257b102a4d3bd5d2cc845c16f
2016-11-07 13:45:48 -08:00
gitbuildkicker
0cda2916e4
merge in nyc-mr1-release history after reset to nyc-mr1-dev
2016-10-20 00:05:49 -07:00
Paul Stewart
1db013fafc
Merge "CtsNetTests: Add a test for b/25624963" am: 9ec7e2127c
...
am: 26fc3c1dd7
2016-10-19 21:57:34 +00:00
Paul Stewart
26fc3c1dd7
Merge "CtsNetTests: Add a test for b/25624963"
...
am: 9ec7e2127c
2016-10-19 21:49:30 +00:00
Treehugger Robot
9ec7e2127c
Merge "CtsNetTests: Add a test for b/25624963"
2016-10-19 21:40:37 +00:00
Nicolas Boichat
3935f21d25
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559 am: 5ee79a1d24 am: 1cdcb253df
...
am: ad7fdb5e34
2016-10-19 20:16:31 +00:00
Nicolas Boichat
ad7fdb5e34
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559 am: 5ee79a1d24
...
am: 1cdcb253df
2016-10-19 19:57:44 +00:00
Nicolas Boichat
1cdcb253df
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559
...
am: 5ee79a1d24
2016-10-19 19:39:58 +00:00
Nicolas Boichat
5ee79a1d24
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9
...
am: d8bd696559
2016-10-19 18:04:32 +00:00
Paul Stewart
22b355560e
CtsNetTests: Add a test for b/25624963
...
Ensure that password is not output in toString() for an enterprise
credential.
Bug: 25624963
Test: Run this CTS test: run cts --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
Change-Id: I84a62ae5d37aa7d397203f41362dadb8ceba1e62
2016-10-19 10:46:09 -07:00
gitbuildkicker
112760739a
merge in nyc-mr1-release history after reset to nyc-mr1-dev
2016-10-18 00:05:47 -07:00
Nicolas Boichat
d8bd696559
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292
...
am: 3342023de9
Change-Id: I6c3da43716d4072e6f0beb3e3a2b5b0bffa0aba3
2016-10-18 00:17:23 +00:00
Nicolas Boichat
c4df82d292
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426
...
am: ffe4cefe73
Change-Id: Ib17900cfd7e3371c6afb703c956dd9d4aa7e26f1
2016-10-17 22:04:33 +00:00
Nicolas Boichat
5696846426
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
am: 36c0f02d94
2016-10-17 21:50:57 +00:00
Nicolas Boichat
4074750e69
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce am: 171491fa35 am: 983fbfccec
...
am: d9559a2b24
2016-10-17 17:43:13 +00:00
Nicolas Boichat
d9559a2b24
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce am: 171491fa35
...
am: 983fbfccec
2016-10-17 17:32:35 +00:00
Nicolas Boichat
983fbfccec
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce
...
am: 171491fa35
2016-10-17 17:23:12 +00:00
Nicolas Boichat
171491fa35
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9
...
am: fac99e31ce
2016-10-17 17:10:49 +00:00
Nicolas Boichat
fac99e31ce
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94
...
am: 516b0616e9
2016-10-17 05:23:18 +00:00
Nicolas Boichat
516b0616e9
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
am: 36c0f02d94
2016-10-17 05:15:47 +00:00
gitbuildkicker
9209abaacf
merge in nyc-mr1-release history after reset to nyc-mr1-dev
2016-10-16 00:05:53 -07:00
Tina Zhou
6854180825
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837 am: 908de2e143 am: e7fd69c032
...
am: 6a52d04b89
2016-10-13 16:19:52 +00:00
peter_li
058a74f477
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472 am: 254dfe5017 am: dc396795cc
...
am: efa1aec0f5
2016-10-13 16:19:20 +00:00
Tina Zhou
6a52d04b89
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837 am: 908de2e143
...
am: e7fd69c032
2016-10-13 16:12:40 +00:00
peter_li
efa1aec0f5
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472 am: 254dfe5017
...
am: dc396795cc
2016-10-13 16:12:17 +00:00
Tina Zhou
1e57f971a4
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837
...
am: 1ef49dfc5d
2016-10-13 16:04:17 +00:00
Tina Zhou
e7fd69c032
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837
...
am: 908de2e143
2016-10-13 16:04:11 +00:00
peter_li
24c9b794f6
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472
...
am: 9e20cad5eb
2016-10-13 16:03:54 +00:00
peter_li
dc396795cc
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472
...
am: 254dfe5017
2016-10-13 16:03:47 +00:00
Tina Zhou
1ef49dfc5d
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5
...
am: 4c76844837
2016-10-13 15:57:25 +00:00
Tina Zhou
908de2e143
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5
...
am: 4c76844837
2016-10-13 15:57:12 +00:00
peter_li
9e20cad5eb
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d
...
am: ca83ca8472
2016-10-13 15:56:56 +00:00
peter_li
254dfe5017
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d
...
am: ca83ca8472
2016-10-13 15:56:52 +00:00
Tina Zhou
4c76844837
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev
...
am: e7c890f1e5
2016-10-13 15:49:18 +00:00
peter_li
ca83ca8472
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case.
...
am: 2ecad8d87d
2016-10-13 15:49:16 +00:00
Tina Zhou
e7c890f1e5
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case." into nougat-cts-dev
2016-10-13 15:39:50 +00:00
peter_li
2ecad8d87d
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case.
...
Symptom: It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case.
Root Cause: The test function “setBatterySaverMode” of “CtsHostsideNetworkTests” use command to set setting DB when trying to turn on battery saver. But while trying to turn off battery saver, it only use charger plug-in event. It should be more reasonable to turn off battery saver through similar DB setting as this function did at turning on.
Solution: To control battery saver function from setting DB.
Project:
Note:
Test done by RD:
Futher testing need Q team's support:
Bug: 31897608
Change-Id: Id70ba458e85f98393d7652bb4e79bd182172c60f
2016-10-13 07:36:53 +00:00
gitbuildkicker
250243f4fc
merge in nyc-mr1-release history after reset to nyc-mr1-dev
2016-10-09 00:06:00 -07:00
