The Android Open Source Project
cf295965a6
[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 2c514c69b7 -s ours am: 14837c2f31 -s ours
...
am: 0c3285031b
2019-03-11 14:34:28 -07:00
The Android Open Source Project
0c3285031b
[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 2c514c69b7 -s ours
...
am: 14837c2f31
2019-03-11 14:05:05 -07:00
The Android Open Source Project
14837c2f31
[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master
...
am: 2c514c69b7
2019-03-11 13:07:41 -07:00
The Android Open Source Project
2c514c69b7
DO NOT MERGE - Skip PPRL.190305.001 into master
...
Bug: 127812889
Change-Id: I544793199b894342e9dc245bb4254d17854afeed
2019-03-11 11:23:23 -07:00
Brett Chabot
6d9fdc0839
Migrate frameworks/opt/net/ethernet to androidx.test am: e9eff7a450 am: da5fc01718
...
am: d24b0551d2
2019-03-05 20:27:28 -08:00
Brett Chabot
d24b0551d2
Migrate frameworks/opt/net/ethernet to androidx.test am: e9eff7a450
...
am: da5fc01718
2019-03-05 20:19:26 -08:00
Brett Chabot
da5fc01718
Migrate frameworks/opt/net/ethernet to androidx.test
...
am: e9eff7a450
2019-03-05 20:16:27 -08:00
Brett Chabot
e9eff7a450
Migrate frameworks/opt/net/ethernet to androidx.test
...
See go/jetpack-test-android-migration
Test: compile
Change-Id: I20fc49dd2487af2245f060454e7f32f5e9145a9c
2019-03-05 09:10:36 -08:00
Xin Li
841cc7f4d8
Merge stage-aosp-master into pi-dev-plus-aosp
...
am: 17c07503ec
2019-02-25 05:35:54 -08:00
Xin Li
17c07503ec
Merge stage-aosp-master into pi-dev-plus-aosp
...
Bug: 126125118
Change-Id: Ifeafc16bc4f434aa86b015b4bbedceee14dc334f
2019-02-25 00:30:16 -08:00
Xin Li
1206467ba2
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I49bc176829a1f38eb79f28e4749785c2e9426314
2019-02-20 16:19:22 -08:00
Xin Li
acbced583f
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master am: f8b2a96d17 -s ours
...
am: 3b5065bb77
2019-02-14 21:02:57 -08:00
Xin Li
3b5065bb77
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: f8b2a96d17
2019-02-14 14:34:14 -08:00
Xin Li
f8b2a96d17
DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: I4c7e99256bd9d37fc4aa92d145ead2cdd4eb8306
2019-02-12 13:51:52 -08:00
android-build-team Robot
fdc1d0fff5
Snap for 5180536 from 016e5502ac to pi-platform-release
...
Change-Id: Icc5d32680bf08d75f01937a71eb845b89018cce6
2019-02-09 02:37:47 +00:00
Remi NGUYEN VAN
1972808bec
Migrate EthernetNetworkFactory to IIpClient am: 5060d1d1be am: c7c0092d82
...
am: d0d0ac091b
2019-01-24 22:29:49 -08:00
Remi NGUYEN VAN
d0d0ac091b
Migrate EthernetNetworkFactory to IIpClient am: 5060d1d1be
...
am: c7c0092d82
2019-01-24 22:20:34 -08:00
Remi NGUYEN VAN
c7c0092d82
Migrate EthernetNetworkFactory to IIpClient
...
am: 5060d1d1be
2019-01-24 22:08:32 -08:00
Remi NGUYEN VAN
5060d1d1be
Migrate EthernetNetworkFactory to IIpClient
...
Test: atest EthernetServiceTests
Bug: b/112869080
Change-Id: I54f32d3031e63c7dea78936b6fe5e83e5b293c33
2019-01-25 12:34:03 +09:00
Sal Savage
9ae59e4d4c
Allow network transport type override am: d3a5c0404c am: ea38c67494
...
am: bfb81eb359
2019-01-22 17:49:53 -08:00
Sal Savage
bfb81eb359
Allow network transport type override am: d3a5c0404c
...
am: ea38c67494
2019-01-22 17:11:11 -08:00
Sal Savage
ea38c67494
Allow network transport type override
...
am: d3a5c0404c
2019-01-22 16:43:32 -08:00
Sal Savage
d3a5c0404c
Allow network transport type override
...
Bug: b/112588045
Test: atest EthernetServiceTests --verbose
Test: kitchensink with RPi devices connected by USB -> Ethernet
adapters. Edit config.xml to try different tranport
overrides manually. Use dumpsys ethernet to show final
final network scores.
Change-Id: I482e78a76d06c9c090aa6816db14bb346eb6528b
2019-01-15 11:56:50 -08:00
Lorenzo Colitti
84c5bd7901
Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory." am: ed99be7316 am: bc15b0a762
...
am: c05e7f186b
2018-10-26 00:57:46 -07:00
Lorenzo Colitti
c05e7f186b
Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory." am: ed99be7316
...
am: bc15b0a762
2018-10-26 00:52:46 -07:00
Lorenzo Colitti
bc15b0a762
Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory."
...
am: ed99be7316
2018-10-26 00:47:42 -07:00
Treehugger Robot
ed99be7316
Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory."
2018-10-26 07:36:04 +00:00
Bill Yi
da9da4b277
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 1f3bb73ceb -s ours am: b03031931a -s ours
...
am: 40968a65fc
2018-10-24 19:11:06 -07:00
Bill Yi
40968a65fc
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 1f3bb73ceb -s ours
...
am: b03031931a
2018-10-24 18:42:05 -07:00
Bill Yi
b03031931a
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 1f3bb73ceb
2018-10-24 16:19:09 -07:00
Bill Yi
1f3bb73ceb
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: Iad478362d4242e6cfbb8737ab7c9c1329cd9bbf2
2018-10-24 14:47:00 -07:00
Bill Yi
eaf1e23f03
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: da22cfab52 -s ours
...
am: 9ee2374f51
2018-10-24 09:39:07 -07:00
Bill Yi
9ee2374f51
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: da22cfab52
2018-10-24 09:31:46 -07:00
Bill Yi
da22cfab52
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I834e5159707311460b9b940996ff7c228a9c36f9
2018-10-24 09:06:51 -07:00
android-build-team Robot
016e5502ac
Snap for 5087486 from b3aa618706 to pi-qpr2-release
...
Change-Id: I5ee774fa258492c202c81f56eb85f019ded154b2
2018-10-24 03:05:02 +00:00
Chalard Jean
c52fab7839
Strategic fix for infinite loop am: b3aa618706
...
am: eebab15de9
2018-10-18 01:13:17 -07:00
Chalard Jean
eebab15de9
Strategic fix for infinite loop
...
am: b3aa618706
2018-10-18 01:10:16 -07:00
Lorenzo Colitti
4f316a4420
Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory.
...
These should not affect network refcount and thus should not be
passed to the network transport.
Bug: 116034205
Test: successfully established a VPN when connected to USB ethernet
Change-Id: I66517d86f35b8cfc1e211cb189127187d2744b60
2018-10-16 17:36:40 +09:00
Chalard Jean
7dcb06ea25
Strategic fix for infinite loop am: 33893d68d4 am: 874fbe4b27
...
am: d708d70026
2018-08-22 08:02:20 -07:00
Chalard Jean
9d33c836d4
Merge "Tiny tiny style fix" am: 6d262af067 am: f05daf0388
...
am: 7d687a4e7d
2018-08-22 07:48:59 -07:00
Chalard Jean
d708d70026
Strategic fix for infinite loop am: 33893d68d4
...
am: 874fbe4b27
2018-08-22 07:11:30 -07:00
Chalard Jean
7d687a4e7d
Merge "Tiny tiny style fix" am: 6d262af067
...
am: f05daf0388
2018-08-22 05:40:58 -07:00
Chalard Jean
874fbe4b27
Strategic fix for infinite loop
...
am: 33893d68d4
2018-08-22 05:32:12 -07:00
Chalard Jean
f05daf0388
Merge "Tiny tiny style fix"
...
am: 6d262af067
2018-08-22 04:17:26 -07:00
Chalard Jean
b3aa618706
Strategic fix for infinite loop
...
Bug: 111326363
Test: Manual + atest frameworks-net + atest frameworks/opt/net/ethernet/tests/java/com/android/server
Change-Id: Id262df4e41de5c74784637ae4a5459c3fab9fb74
2018-08-22 09:31:29 +00:00
Chalard Jean
33893d68d4
Strategic fix for infinite loop
...
Bug: 111326363
Test: Manual + atest frameworks-net
Change-Id: Id262df4e41de5c74784637ae4a5459c3fab9fb74
2018-08-22 06:25:27 +00:00
Chalard Jean
6d262af067
Merge "Tiny tiny style fix"
2018-08-22 01:44:19 +00:00
Chalard Jean
153ef57146
Tiny tiny style fix
...
Test: none needed
Change-Id: Ic6cfedf9cfe60984ce7fbd59bdaec55b0bba3001
2018-08-21 18:18:41 +09:00
Colin Cross
77c81f41df
Convert frameworks/opt/net/ethernet to Android.bp am: 4da7fda56b am: c5d21eaa24
...
am: 22ba385503
2018-08-17 18:44:53 -07:00
Colin Cross
22ba385503
Convert frameworks/opt/net/ethernet to Android.bp am: 4da7fda56b
...
am: c5d21eaa24
2018-08-17 17:59:45 -07:00
