Nathan Harold
92a7123377
Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev
...
am: d017754253
2017-04-19 00:57:01 +00:00
Nathan Harold
d017754253
Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev
2017-04-19 00:36:18 +00:00
nharold
33a246829e
Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16 am: 335800627b
...
am: bd6d169a27
2017-04-18 22:10:17 +00:00
nharold
bd6d169a27
Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16
...
am: 335800627b
Change-Id: I276c35e350be82b01f68c260a39e7b33bab619c1
2017-04-18 22:00:45 +00:00
nharold
40fe746f16
Merge "Remove DatagramSocket calls from IpSecManagerTest"
2017-04-18 18:35:21 +00:00
Nathan Harold
372975ecb2
Remove DatagramSocket calls from IpSecManagerTest
...
Because the DatagramSocket version of the API is being
hidden, this test is being converted to use the
FileDescriptor version of applyTransportModeTransform()
and removeTransportModeTransform()
Bug: 37446006
Test: compilation
Merged-In: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
Change-Id: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
(cherry picked from commit 8e0db4ceaa9b2940942132e452d44cd59ff971e2)
2017-04-17 22:04:36 -07:00
Nathan Harold
f20fc80ba5
Remove DatagramSocket calls from IpSecManagerTest
...
Because the DatagramSocket version of the API is being
hidden, this test is being converted to use the
FileDescriptor version of applyTransportModeTransform()
and removeTransportModeTransform()
Bug: 37446006
Test: compilation
Change-Id: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
2017-04-17 22:01:26 -07:00
Sudheer Shanka
21ec60f4db
Merge "Skip data saver related tests if the device doesn't support it." into oc-dev
...
am: a61bc6a566
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
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
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
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
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
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
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
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
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
2017-04-14 23:00:23 +00:00
Nathan Harold
17ffc4867c
Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev
...
am: 9b807d83a4
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
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
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
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
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
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
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
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
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
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
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
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
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
