Commit Graph

1407 Commits

Author SHA1 Message Date
Sudheer Shanka
21ec60f4db Merge "Skip data saver related tests if the device doesn't support it." into oc-dev
am: a61bc6a566

Change-Id: Idbee1ba7843242a5cac46e8a62c642c2f8b37fd3
2017-04-18 04:29:27 +00:00
Sudheer Shanka
a61bc6a566 Merge "Skip data saver related tests if the device doesn't support it." into oc-dev 2017-04-18 04:23:20 +00:00
Tina Zhou
e6254e6d0f Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af am: 9d66f94f38
am: ecb7895518

Change-Id: Ia58d668d02a973cceb5fa6fa3929a58b928427b3
2017-04-17 18:07:17 +00:00
Tina Zhou
36d6165138 Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af am: 9d66f94f38
am: 02bf062557

Change-Id: I190660c19b73f655a15c6751376b177e2afbc586
2017-04-17 18:02:48 +00:00
Tina Zhou
ecb7895518 Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af
am: 9d66f94f38

Change-Id: I5e4b1272325ab0f16eb4cfc981b10a05c776a2da
2017-04-17 17:58:56 +00:00
Tina Zhou
02bf062557 Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af
am: 9d66f94f38

Change-Id: I4120d23485f910260b31794894373df52018adaa
2017-04-17 17:58:45 +00:00
Tina Zhou
293d94f734 Merge "Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f" am: 0a33006809 am: 6012fe12dc
am: aeb1d2f1cf

Change-Id: I60b3c8fd3d3167d4f878a273b4122514693d4941
2017-04-17 17:58:21 +00:00
Tina Zhou
aeb1d2f1cf Merge "Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f" am: 0a33006809
am: 6012fe12dc

Change-Id: Id80e3f9e8fbb5eceb9a2b3da341f49803795b3e6
2017-04-17 17:53:26 +00:00
Tina Zhou
ba9c18e7af Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f
am: af849f9dc0

Change-Id: Idbe7d08b01d9138c5c2082f08a392090dd82c466
2017-04-17 17:48:16 +00:00
Tina Zhou
af849f9dc0 Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev
am: 6ee31c8e8f

Change-Id: Ie16ec6e4e3d139da6bb66d18bba18c97b1ed7a4c
2017-04-17 17:43:44 +00:00
Android Merger
0a33006809 Merge "Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f" 2017-04-17 17:39:14 +00:00
Tina Zhou
e5e55017fc Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev
am: 6ee31c8e8f

Change-Id: Id8398453ea4b85d04da963ab48876407b0237e41
2017-04-17 17:39:06 +00:00
Tina Zhou
6ee31c8e8f Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev 2017-04-17 17:37:29 +00:00
Sudheer Shanka
cfae83193b Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3 -s ours
am: 65f950fd9f

Change-Id: I4b6292e5146beb76946c6e331f93e6959e895872
2017-04-15 01:06:58 +00:00
Sudheer Shanka
65f950fd9f Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b
am: 5b87fbabc3  -s ours

Change-Id: Ib84441f7d5d47dd4b8f5a61ae1f679e93aab7438
2017-04-15 01:04:12 +00:00
Sudheer Shanka
b420e267e1 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3
am: 8d873914a2  -s ours

Change-Id: Ic8ad0c278439e66c8bb70efa15a1618ff81f743a
2017-04-14 23:01:50 +00:00
Sudheer Shanka
a203e22df8 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours" am: 67a8712d22 -s ours am: e9122b9946 -s ours
am: 368d667a4b  -s ours

Change-Id: I71cc8a02fe24e2d6c0563b17b8b853381b39880c
2017-04-14 23:00:23 +00:00
Nathan Harold
17ffc4867c Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev
am: 9b807d83a4

Change-Id: Id0d8cc946c6a6a73bc661263dc1233a81ef4df0a
2017-04-14 20:29:21 +00:00
Nathan Harold
9b807d83a4 Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev 2017-04-14 20:21:19 +00:00
Sudheer Shanka
d99f8e8b16 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2 -s ours
am: dc3f163de2

Change-Id: I2f77c6b4cef68ef6f2c4e53bd76f1449fadd5154
2017-04-14 18:41:26 +00:00
Sudheer Shanka
dc3f163de2 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5
am: 4952b4fce2  -s ours

Change-Id: Icdcf777e3873eda4fa552ab6f1791d1ff42ee74d
2017-04-14 18:39:00 +00:00
Sudheer Shanka
e33887ac9b Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2
am: 2d01f2a0de  -s ours

Change-Id: I7558b6f5edb9f702b1d808f535569aa45a537af9
2017-04-14 16:59:39 +00:00
Sudheer Shanka
8d873914a2 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b
am: 5b87fbabc3

Change-Id: I283e9c5b9b59f4e59da918dd5d0c4bd57ccc265a
2017-04-14 00:57:07 +00:00
Sudheer Shanka
368d667a4b Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours" am: 67a8712d22 -s ours
am: e9122b9946  -s ours

Change-Id: I7caa38876bbc9963a609be7f9b69b65f80796b17
2017-04-14 00:55:16 +00:00
Sudheer Shanka
24df7fc52b Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours
am: 4ecf9aadc5

Change-Id: Ib0ba9f2c58976fab832ffc9535c1f49db49ecdca
2017-04-14 00:48:47 +00:00
Sudheer Shanka
2d01f2a0de Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5
am: 4952b4fce2

Change-Id: I1fa9eba17ed720f622284274de7056d9fd4d4d85
2017-04-14 00:43:20 +00:00
Sudheer Shanka
4ecf9aadc5 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev
am: 4b656d1d00  -s ours

Change-Id: Ifcebf7ebf95f6cbb8a49163e1ac657d3d42320c5
2017-04-14 00:43:16 +00:00
Android Merger
67a8712d22 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours" 2017-04-14 00:43:14 +00:00
Sudheer Shanka
fd60ad1fc6 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev
am: 4b656d1d00  -s ours

Change-Id: If60f4a8c6efadb3e805ffe9dd19fac39545b59f8
2017-04-14 00:43:07 +00:00
Treehugger Robot
4b656d1d00 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev 2017-04-14 00:36:09 +00:00
Sudheer Shanka
a12dbc91c5 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours
am: 64c8f23d98

Change-Id: I1845edbd31e802fffaa6da3407b2a767c2cd7e40
2017-04-14 00:30:45 +00:00
Sudheer Shanka
64c8f23d98 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f
am: 8be8d0d6a9  -s ours

Change-Id: Iac33c3abd87928b5969cf01066d9d770d9a1a10b
2017-04-14 00:24:47 +00:00
Android Build Merger (Role)
f04219bb3a Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours am: bb6a9be084 am: 89195184af am: 0a0b1d2fe6 -s ours am: 8903a0aa04" into oc-dev-plus-aosp 2017-04-13 23:55:22 +00:00
Sudheer Shanka
457a418157 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours am: bb6a9be084 am: 89195184af am: 0a0b1d2fe6 -s ours
am: 8903a0aa04

Change-Id: Idae3b46620e31aa51792ab2f4387a80a597ca56a
2017-04-13 23:54:53 +00:00
Sudheer Shanka
9830006d01 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours am: bb6a9be084 am: 89195184af am: 0a0b1d2fe6
am: 5e93a23108  -s ours

Change-Id: I396de4a6a6b4605d2dadde5116953dcb8dc64a2f
2017-04-13 23:54:45 +00:00
Sudheer Shanka
5e93a23108 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours am: bb6a9be084 am: 89195184af
am: 0a0b1d2fe6

Change-Id: I40645d179ab9fea74f179052ff27ce309ca5e5a7
2017-04-13 23:49:16 +00:00
Sudheer Shanka
8903a0aa04 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours am: bb6a9be084 am: 89195184af
am: 0a0b1d2fe6  -s ours

Change-Id: I5d18b543effbf8f4af110bade420d6f67b3965d2
2017-04-13 23:49:15 +00:00
Sudheer Shanka
26d36057bb Merge "Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours" am: 608a3b8f82 -s ours am: 8884bfc2ac -s ours" into nyc-mr2-dev-plus-aosp
am: c95fb00d30  -s ours

Change-Id: Ifd4c31704739b669fee3ce3eaf5acbcf5b0730d4
2017-04-13 23:45:16 +00:00
Sudheer Shanka
ff4c3f975e Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours" am: 608a3b8f82 -s ours
am: 8884bfc2ac  -s ours

Change-Id: Ie8faacecf2d8dbe2bc6e1e863ea37395b4df1027
2017-04-13 23:38:17 +00:00
Sudheer Shanka
89195184af Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours
am: bb6a9be084

Change-Id: I19a9896b209bd724b57b7a98098d44c90725089e
2017-04-13 23:37:44 +00:00
Sudheer Shanka
bb6a9be084 Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev
am: 137a9169cf  -s ours

Change-Id: Idf00e79de9ee11e39e6942f7b9d17ebfbf80fa3f
2017-04-13 23:32:26 +00:00
Sudheer Shanka
8be8d0d6a9 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours
am: 8b0491eb1f

Change-Id: I6df9cff2bdb441d7c7b45dbcef252b195212a929
2017-04-13 23:32:16 +00:00
Android Merger
608a3b8f82 Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev am: 137a9169cf -s ours" 2017-04-13 23:26:12 +00:00
Sudheer Shanka
8b0491eb1f Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev
am: 43a0aa48b0  -s ours

Change-Id: I7c31558b0102a8464d15121c21402f0de77c8b12
2017-04-13 23:26:10 +00:00
Sudheer Shanka
b383c0373b Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev
am: 137a9169cf  -s ours

Change-Id: Ic97f5a0744e706d343eccf1dd242e4da45893ca8
2017-04-13 23:26:06 +00:00
Android Merger
137a9169cf Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours" into nougat-mr1-cts-dev 2017-04-13 23:20:39 +00:00
Sudheer Shanka
12160bc460 Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev
am: 43a0aa48b0  -s ours

Change-Id: Ibc146b186e9f9de3e6057f6fef1f1e0bbb5e0347
2017-04-13 23:20:32 +00:00
Nathan Harold
a1ba8122b6 Update IpSecAlgorithm CTS for API compliance changes
Bug: 36073210, b/34811227
Test: verified on Bullhead
Change-Id: I8f37016cc9aadafd3e58f6af535bd7bc1d0f4a96
2017-04-13 15:04:10 -07:00
Jocelyn Dang
9665fa7f99 Merge "Change test to use set-mode cmd." into oc-dev
am: f9a022629f

Change-Id: Id088abeb0c930df76e9450414588d2ddea380d60
2017-04-13 18:50:49 +00:00
Jocelyn Dang
f9a022629f Merge "Change test to use set-mode cmd." into oc-dev 2017-04-13 18:38:14 +00:00