Juju Sung
88df18bcb4
Merge "Merge "Fix lowMemoryKill with app2.MyService" into pie-cts-dev am: 86ca1697d0"
...
am: c061b51a40
2018-12-25 00:32:29 -08:00
Android Merger
c061b51a40
Merge "Merge "Fix lowMemoryKill with app2.MyService" into pie-cts-dev am: 86ca1697d0"
2018-12-25 08:22:06 +00:00
Juju Sung
46e3f1b3a5
Merge "Fix lowMemoryKill with app2.MyService" into pie-cts-dev
...
am: 86ca1697d0
2018-12-25 00:21:50 -08:00
Treehugger Robot
86ca1697d0
Merge "Fix lowMemoryKill with app2.MyService" into pie-cts-dev
2018-12-25 08:13:30 +00:00
Juju Sung
62eb00af49
Fix lowMemoryKill with app2.MyService
...
MyForegroundService.java will change to background service during
testing,It’s ADJ will be 900. When run on a 512M project, it will
easily killed due to low memory.
Only set BIND_NOT_FOREGROUND and remove BIND_ALLOW_OOM_MANAGEMENT.
So MyForegroundService can still change process state between foreground
and background by startFround()/stopFround(). But it's ADJ will not too
high in background.
Bug: 120038371
Test: VTS, ran the test 5 times and it passed 5 times
Change-Id: I555366db7dd9904bc119bea94efbbe6422764f69
2018-12-25 08:07:26 +00:00
Paul Duffin
2ca45856cb
Merge "Add tests for InetAddresses.parseNumericAddress()"
...
am: 02ff9cc6ca
Change-Id: If210069d2dc6ef1f46d12d5e9341cc200a729d70
2018-12-18 10:35:11 -08:00
Paul Duffin
7131af6b93
Add tests for InetAddresses.parseNumericAddress()
...
Test: run cts -m CtsNetTestCases
Bug: 78686891
Change-Id: I1e121ab3fd619964625c4b51e0b7280eef001775
2018-12-17 15:46:26 +00:00
Xin Li
6046e7a005
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
...
am: d80076c038
2018-12-13 11:53:33 -08:00
Xin Li
f032484732
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 61b64108d7
2018-12-13 11:13:46 -08:00
Treehugger Robot
d80076c038
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
2018-12-13 05:45:20 +00:00
Lorenzo Colitti
201ef3ffbe
Merge "Test for asynchronous DNS query API"
...
am: 6357dee73d
Change-Id: Ie13c5cf9ce4510a6565cae6da5cfd99b01c0b964
2018-12-12 20:20:26 -08:00
Xin Li
61b64108d7
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
Bug: 120502534
Change-Id: I9857d44f5eeabf6c1ed6b4d872a1bdf22e351a6c
2018-12-11 18:15:44 -08:00
Xin Li
9d3113f2ca
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
Bug: 120502534
Change-Id: I47ec78e46d4fe69da5e42c5887afb914ce231014
2018-12-11 20:27:01 +00:00
Luke Huang
3c5f35a38e
Test for asynchronous DNS query API
...
Add basic test for asynchronous DNS query API
Test: build
atest CtsNativeNetDnsTestCases
Change-Id: Ib757ba8f0128d3efe7dfbcbfb45d36e4350834f9
2018-12-12 04:18:07 +08:00
Ivan Chiang
63d823e08c
Merge "Add test for Uri.toSafeString"
...
am: 5a6e995881
2018-12-10 06:56:16 -08:00
Ivan Chiang
5a6e995881
Merge "Add test for Uri.toSafeString"
2018-12-10 14:32:36 +00:00
Rebecca Silberstein
c580f11166
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours"
...
am: 695f741a71
2018-12-05 21:36:13 -08:00
Android Merger
695f741a71
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours"
2018-12-06 04:59:14 +00:00
Rebecca Silberstein
16d6f1f7db
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
...
am: a9d9e557e6
2018-12-05 20:59:02 -08:00
Android Merger
a9d9e557e6
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
2018-12-06 04:51:40 +00:00
Rebecca Silberstein
a6b44c093b
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
...
am: 7bd8640f4d
2018-12-05 20:51:32 -08:00
Android Merger
7bd8640f4d
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
2018-12-06 04:45:48 +00:00
Rebecca Silberstein
ac3705bf4c
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev
...
am: 8c61445473 -s ours
Change-Id: I1581d4da5c0b0ffabb96941a8a416f7012630b80
2018-12-05 20:45:38 -08:00
Rebecca Silberstein
af95fad957
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-11-29 15:24:49 +08:00
Bill Yi
28d9fb60c5
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
...
Change-Id: Id9555bd1fed41e807cc34364ee6fdcad3864cc59
2018-11-28 18:33:32 -08:00
Mark Chien
78ca8f0922
Merge "Exempt adb socket for hostside VpnTest"
...
am: 1b99a84106
Change-Id: I032a25b809c50f3119ca16d79880b194dee28652
2018-11-26 00:06:21 -08:00
markchien
de0f268f78
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Test: - build pass
- run cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideVpnTests
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
2018-11-22 20:39:46 +08:00
Tony Huang
c1ba8dd9ac
Add test for Uri.toSafeString
...
Due to exposing api of toSafeString, add coresponding testing
for it.
Bug: 119153962
Test: atest UriTest
Change-Id: I156b2b03ee9c1d4a05ac635b4f684c5b4dcfca08
2018-11-09 14:23:31 +08:00
Bill Yi
7c34d32772
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: c25ddbfef4
2018-10-24 16:03:47 -07:00
Bill Yi
c25ddbfef4
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: Ie395adde23471676aa6ea5604e3ced527dbf887a
2018-10-24 14:45:11 -07:00
Bill Yi
fa18597e5e
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I53e68a9fa72d1f0635d4384fc7e9550e8a45d3c3
2018-10-24 09:04:51 -07:00
Bill Yi
b12ac32195
Merge pi-dr1-dev to aosp-master
...
am: 394eb13546
2018-10-19 14:37:23 -07:00
Bill Yi
394eb13546
Merge pi-dr1-dev to aosp-master
...
Change-Id: I7cd9310e06805e7d2b70a53873f5f0e235c0ac38
2018-10-19 12:20:13 -07:00
Chalard Jean
4b6c4acdb7
Merge "Add Uri tests for IPv6 literal adresses"
...
am: 3d869fea91
2018-10-19 05:07:08 -07:00
Treehugger Robot
3d869fea91
Merge "Add Uri tests for IPv6 literal adresses"
2018-10-19 11:04:29 +00:00
Chalard Jean
2a41b1cdda
Add Uri tests for IPv6 literal adresses
...
Bug: 25540738
Test: this
Change-Id: Id63a5dd17293014218df78bcb440993cc5f3beb8
2018-10-19 08:56:18 +00:00
Neil Fuller
895ebc7f40
Merge "Remove explicit dependency on conscrypt"
...
am: 92ed75c5f7
Change-Id: I46191c34b492a7ccb4c679a8e5d133d29a407b15
2018-10-12 03:53:06 -07:00
Neil Fuller
0b72fa9cfe
Remove explicit dependency on conscrypt
...
The dependency is unnecessary as by default conscrypt
is included in the "standard libraries".
Test: build
Bug: 113148576
Change-Id: I30d68049215c61931bdd7aa5e2a0f125e6d1bf90
2018-10-11 16:11:37 +01: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
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
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
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
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
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
3ea2bfe8c1
Merge "Refactor duplicate code into single function"
...
am: 1b118b032b
Change-Id: I81baf65489c3c282416ec3903d13f6a94a079e95
2018-09-30 22:45:48 -07:00
