saurav subedi
33f8cba38f
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours" am: 84ccc5fc6b -s ours
...
am: 98b4477869
2018-10-02 13:48:09 -07:00
saurav subedi
3432e21f81
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours
...
am: 9fc53d028b
2018-10-02 13:33:49 -07:00
saurav subedi
98b4477869
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours"
...
am: 84ccc5fc6b
2018-10-02 13:31:54 -07:00
saurav subedi
9fc53d028b
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev
...
am: 7b1734a9b4
2018-10-02 13:27:23 -07:00
saurav subedi
0d4ec7b056
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours am: 1862b3f6be -s ours
...
am: 9b3db79417
2018-10-02 13:25:59 -07:00
Android Merger
84ccc5fc6b
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours"
2018-10-02 19:58:53 +00:00
saurav subedi
14573d43fb
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev
...
am: 7b1734a9b4
2018-10-02 12:58:48 -07:00
saurav subedi
9b3db79417
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours
...
am: 1862b3f6be
2018-10-02 12:55:45 -07:00
Android Merger
7b1734a9b4
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev
2018-10-02 19:54:48 +00:00
saurav subedi
69e6c0744e
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev
...
am: 4173c4fce5
2018-10-02 12:54:42 -07:00
saurav subedi
1862b3f6be
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev
...
am: 4173c4fce5
2018-10-02 12:52:42 -07:00
Treehugger Robot
4173c4fce5
Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev
2018-10-02 19:04:22 +00:00
Android Build Merger (Role)
b03d045a65
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours" am: d68df5c1ec -s ours am: 4572cb4361 -s ours" into pi-dev-plus-aosp
2018-10-01 22:59:01 +00:00
Rebecca Silberstein
f97b308748
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours" am: d68df5c1ec -s ours
...
am: 4572cb4361
2018-10-01 15:58:48 -07:00
Rebecca Silberstein
f2a2e42bd0
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a am: 8c71ef4f2e -s ours
...
am: 6c0b196b2e
2018-10-01 15:57:26 -07:00
Rebecca Silberstein
810b0a0fe6
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours
...
am: 7e40d670d1
2018-10-01 15:54:22 -07:00
Rebecca Silberstein
4572cb4361
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours"
...
am: d68df5c1ec
2018-10-01 15:43:14 -07:00
Rebecca Silberstein
6c0b196b2e
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a
...
am: 8c71ef4f2e
2018-10-01 15:36:10 -07:00
Rebecca Silberstein
7e40d670d1
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev
...
am: 88aab6ce5f
2018-10-01 15:33:32 -07:00
Rebecca Silberstein
8c71ef4f2e
Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev
...
am: 354de98f9a
Change-Id: I4b8dd8fbb8e4765cba4e95e521f528f6dd752df3
2018-10-01 15:11:57 -07:00
Android Merger
d68df5c1ec
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours"
2018-10-01 22:08:29 +00:00
Rebecca Silberstein
0552d427ad
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev
...
am: 88aab6ce5f
2018-10-01 15:08:23 -07:00
Android Merger
88aab6ce5f
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev
2018-10-01 22:02:15 +00:00
Rebecca Silberstein
22432b02e4
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev
...
am: 354de98f9a -s ours
Change-Id: I07ca9a21d95bb46d0bc3b8cc8f1f3b50a1480da5
2018-10-01 15:02:07 -07:00
Jeff Vander Stoep
f153c4d29e
Merge "Refactor duplicate code into single function" am: 1b118b032b
...
am: 3ea2bfe8c1
2018-09-30 22:52:51 -07:00
Jeff Vander Stoep
3ea2bfe8c1
Merge "Refactor duplicate code into single function"
...
am: 1b118b032b
Change-Id: I81baf65489c3c282416ec3903d13f6a94a079e95
2018-09-30 22:45:48 -07:00
Jeff Vander Stoep
1c4ab19478
Merge "Move tests requiring /proc/sys/net access to hostside" am: ee3d0d4fba
...
am: 286b5f2df8
2018-09-28 14:27:00 -07:00
Jeff Vander Stoep
286b5f2df8
Merge "Move tests requiring /proc/sys/net access to hostside"
...
am: ee3d0d4fba
Change-Id: I22de2a03481b8f7bf87d040c778ff524866c5655
2018-09-28 14:12:04 -07:00
Jeff Vander Stoep
d502c99123
Refactor duplicate code into single function
...
Address comments in aosp/763607
Bug: 116053204
Test: atest ProcNetTest
Change-Id: Iec8b58b6499a7764b3757d4dd820e1f45a65e814
2018-09-28 10:36:12 -07:00
Jeff Vander Stoep
ff39f3fa71
Move tests requiring /proc/sys/net access to hostside
...
This access is going away for apps. Move these tests to hostside
tests to be executed by the shell domain.
Test: atest cts/hostsidetests/net/src/com/android/cts/net/ProcNetTest.java
Test: atest android.net.cts.ConnectivityManagerTest
Test: atest android.net.cts.IpSecSysctlTest
Test: atest android.net.cts.MultinetworkSysctlTest
Bug: 116053204
Change-Id: Id7e867184dd344a2d877515956e76019d627788b
2018-09-28 10:29:01 -07:00
saurav subedi
cd79fb2af6
DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1
...
Devices that don't provide data saver mode must return
RESTRICT_BACKGROUND_STATUS_DISABLED for the
ConnectivityManager#getRestrictBackgroundStatus()
Bug: 116495679
Test: make cts
Change-Id: I81b52c9d26afcf51a7e416d20589c9c7cfb878f6
2018-09-27 21:54:01 +00:00
Jeffrey Vander Stoep
29e7b8ad82
Merge "VpnTest: test getConnectionOwnerUid API" am: ee991403a1
...
am: 7efa354f0c
2018-09-21 14:42:46 -07:00
Jeffrey Vander Stoep
7efa354f0c
Merge "VpnTest: test getConnectionOwnerUid API"
...
am: ee991403a1
Change-Id: Ia45858d32da629aeb9795a0dcc98ef97d0f001ff
2018-09-21 14:21:43 -07:00
Jeff Vander Stoep
ab53484d7b
VpnTest: test getConnectionOwnerUid API
...
Test connection->UID resolution for both UDP and TCP connections.
Bug: 9496886
Bug: 109758967
Test: atest HostsideVpnTests
Change-Id: Ic17c64df74f65d788fd3d95a25af3c5b44946881
2018-09-18 15:40:32 -07:00
Rebecca Silberstein
340047b18c
WifiManagerTest: allow for multiple modes
...
Now that WifiService can/will support dual simultaneous mode operation, make
sure the tests allow for it as well.
Bug: 31346104
Bug: 115567184
Test: atest android.net.wifi.cts
Change-Id: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-09-18 14:38:54 -07:00
saurav subedi
d0ae2d419e
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev am: 601d7ae0d7 -s ours" am: d80f2b67cc -s ours
...
am: 4f4cb685a1
2018-09-06 20:10:23 -07:00
saurav subedi
aea9fa1fe5
Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev am: 601d7ae0d7 -s ours
...
am: 8d9fecee8b
2018-09-06 17:22:22 -07:00
saurav subedi
8d9fecee8b
Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev
...
am: 601d7ae0d7
2018-09-06 16:26:01 -07:00
saurav subedi
518da1c897
[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours am: bf6ddb73d4 -s ours
...
am: 80abafd713
2018-09-06 14:52:33 -07:00
saurav subedi
4f4cb685a1
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev am: 601d7ae0d7 -s ours"
...
am: d80f2b67cc
2018-09-06 14:51:22 -07:00
saurav subedi
80abafd713
[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours
...
am: bf6ddb73d4
2018-09-06 14:41:22 -07:00
Android Merger
d80f2b67cc
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev am: 601d7ae0d7 -s ours"
2018-09-06 21:31:44 +00:00
saurav subedi
facf321e05
Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev
...
am: 601d7ae0d7
2018-09-06 14:31:36 -07:00
saurav subedi
bf6ddb73d4
[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev
...
am: 6cc6a0c703 -s ours
Change-Id: Ib668ac9a7891dac22b6372b12fee510bea94e121
2018-09-06 14:25:34 -07:00
Android Merger
601d7ae0d7
Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev
2018-09-06 21:23:39 +00:00
saurav subedi
48cc401936
[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev
...
am: 6cc6a0c703 -s ours
Change-Id: Iea8628f846981b6e607631158367c643c30dda3b
2018-09-06 14:23:32 -07:00
saurav subedi
6943e15b8c
DO NOT MERGE: CDD Annotations for Section: 7.4.7
...
Bug: 112612833
Test: make cts
Change-Id: I7443794296f9364bc0e88e5ba3b717d6c01511a7
2018-09-06 00:42:25 +00:00
saurav subedi
4a63d9911d
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev am: 76b6ac5e27 -s ours" am: bc6c2016e1 -s ours
...
am: 9a09819614
2018-08-30 16:30:50 -07:00
saurav subedi
54c7c44cb8
Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev am: 76b6ac5e27 -s ours
...
am: 3105765f41
2018-08-30 16:11:42 -07:00
saurav subedi
9a09819614
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev am: 76b6ac5e27 -s ours"
...
am: bc6c2016e1
2018-08-30 16:07:33 -07:00
