summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur
am: 075bbf6d64 Change-Id: I95b26c922e8b19bec14d0be9c6a93291b6b0d069
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Id7b68cfc15856ae3370bb9391b46a67c7c1f5505 BUG: 129345239
2019-03-26Update comments and documentation in net type prop change am: 2b84b49076 am: ↵Sal Savage
4cb1ed3573 am: fe1d8bf999 Change-Id: Ida49c0c86d12e5c0ae0705e53e5657a846c8d2e2
2019-03-26Update comments and documentation in net type prop change am: 2b84b49076Sal Savage
am: 4cb1ed3573 Change-Id: Ib9a534a0e13e4f6f62c27e2d028e085b4a3c1691
2019-03-26Update comments and documentation in net type prop changeSal Savage
am: 2b84b49076 Change-Id: I0fe7d537d46ab0b4bcd6521162e35fcb719f13f9
2019-03-25Update comments and documentation in net type prop changeandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseSal Savage
Bug: b/112588045 Test: atest EthernetServiceTests --verbose Test: kitchensink, dumpsys ethernet, with RPi devices and USB to ethernet adapters. Change-Id: Iaa260aabbbd7aa4b7864eba32ecff7e3f84123c3
2019-03-11[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: ↵The Android Open Source Project
6b957320a9 -s ours am: 3ad87add27 -s ours am: d6f96bf85b -s ours am skip reason: subject contains skip directive Change-Id: Ibc47e3588fd3c7c027c3364899e1085ac512d029
2019-03-11[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: ↵The Android Open Source Project
6b957320a9 -s ours am: 3ad87add27 -s ours am skip reason: subject contains skip directive Change-Id: I24ba2152523a30ccc20028150843f628d735c14f
2019-03-11[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into masterThe Android Open Source Project
am: 6b957320a9 -s ours am skip reason: subject contains skip directive Change-Id: Ic455a6ffd8a17475f7c4419e8995c54ceebfa173
2019-03-11DO NOT MERGE - Skip PPRL.190305.001 into masterandroid-q-preview-1android-o-mr1-iot-release-1.0.10The Android Open Source Project
Bug: 127812889 Change-Id: I544793199b894342e9dc245bb4254d17854afeed
2019-03-05Migrate frameworks/opt/net/ethernet to androidx.test am: f83c1e79ca am: ↵Brett Chabot
43faf397c8 am: 2415a8eaf1 Change-Id: Ie933d7d304bc13a80dd1171a761d480f3cb58353
2019-03-05Migrate frameworks/opt/net/ethernet to androidx.test am: f83c1e79caBrett Chabot
am: 43faf397c8 Change-Id: I7838157884da46c513b171f501d066ced7ecfc18
2019-03-05Migrate frameworks/opt/net/ethernet to androidx.testBrett Chabot
am: f83c1e79ca Change-Id: Ibd005ade7b4aa33335f81ac5386d6cffca8bc0cf
2019-03-05Migrate frameworks/opt/net/ethernet to androidx.testBrett Chabot
See go/jetpack-test-android-migration Test: compile Change-Id: I20fc49dd2487af2245f060454e7f32f5e9145a9c
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 72900c9a28 Change-Id: I1fdf525277c5229791807404f3c74ab51d3ab841
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ifeafc16bc4f434aa86b015b4bbedceee14dc334f
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I49bc176829a1f38eb79f28e4749785c2e9426314
2019-02-14[automerger skipped] DO NOT MERGE - Skip pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: b2d037365c -s ours am: c25e850869 -s ours am skip reason: subject contains skip directive Change-Id: I0b7ad5cf4a9e52234f93790ee87c3b13da4cc680
2019-02-14[automerger skipped] DO NOT MERGE - Skip pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: b2d037365c -s ours am skip reason: subject contains skip directive Change-Id: I0d3c9d594a5d0137a221a418d081d06a3d9fb015
2019-02-12DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-masterXin Li
Bug: 124234733 Change-Id: I4c7e99256bd9d37fc4aa92d145ead2cdd4eb8306
2019-02-09Snap for 5180536 from b8c3b61022636c880f4e5a5e6a71430552025f98 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: Icc5d32680bf08d75f01937a71eb845b89018cce6
2019-01-24Migrate EthernetNetworkFactory to IIpClient am: 05be958f78 am: 8acaab603aRemi NGUYEN VAN
am: 217e2c0d2c Change-Id: If58d85611bee403e429a884f2139c3e5a627b211
2019-01-24Migrate EthernetNetworkFactory to IIpClient am: 05be958f78Remi NGUYEN VAN
am: 8acaab603a Change-Id: I0bae760c343a43ad149e85b7a626ede9c29afc35
2019-01-24Migrate EthernetNetworkFactory to IIpClientRemi NGUYEN VAN
am: 05be958f78 Change-Id: Ic21a0d814cc4adebda0983155d341f3316ee6a54
2019-01-25Migrate EthernetNetworkFactory to IIpClientRemi NGUYEN VAN
Test: atest EthernetServiceTests Bug: b/112869080 Change-Id: I54f32d3031e63c7dea78936b6fe5e83e5b293c33
2019-01-22Allow network transport type override am: 79929d7100 am: 3e28e9edc9Sal Savage
am: c80afeebbe Change-Id: I3c95355d1485a3831c10d3c1672a7f8735b492a3
2019-01-22Allow network transport type override am: 79929d7100Sal Savage
am: 3e28e9edc9 Change-Id: Idcea8fe83d4e16e53213e6b329c4b14d70cd2732
2019-01-22Allow network transport type overrideSal Savage
am: 79929d7100 Change-Id: Iac41b234aa5502d85e8f00275252bbdea838681e
2019-01-15Allow network transport type overrideSal Savage
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
2018-10-26Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory." am: ↵Lorenzo Colitti
8af1c3493f am: 17b2aee34c am: 24c4c52c5b Change-Id: Id19fae76ab3b1633d1be1140f1d66708c09caa4e
2018-10-26Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory." am: ↵Lorenzo Colitti
8af1c3493f am: 17b2aee34c Change-Id: Ib911288c5a800e3d0f22b180a55d0c6339c8bc40
2018-10-26Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory."Lorenzo Colitti
am: 8af1c3493f Change-Id: I0f3920549cba1b1bdb2f8cd0d7a0a0b5ec93897c
2018-10-26Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory."android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseTreehugger Robot
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 374fe4d7f5 -s ours am: c5acc571cd -s ours am: 4791c7b73e -s ours Change-Id: I8d49635cfa4559efeb4e88390422d40a4418900a
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 374fe4d7f5 -s ours am: c5acc571cd -s ours Change-Id: Id6d2c5f4774da1c772207f18b13abc39ad2d6709
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 374fe4d7f5 -s ours Change-Id: Ie37f3aa0e7d1bc76ef776849b6ec07c751d2dc1c
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
Change-Id: Iad478362d4242e6cfbb8737ab7c9c1329cd9bbf2
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: faddc7cdc8 -s ours am: 8cef6591c9 -s ours Change-Id: I089d43355df988ed6e2b207a1b1625381fd0efc3
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: faddc7cdc8 -s ours Change-Id: I1d59b572d325d1d93b6213e905f23c37d69ff781
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I834e5159707311460b9b940996ff7c228a9c36f9
2018-10-24Snap for 5087486 from af3d0ee5e324c4222f9747ccccac207dab3ae49b to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot
pi-qpr2-release Change-Id: I5ee774fa258492c202c81f56eb85f019ded154b2
2018-10-18Strategic fix for infinite loop am: af3d0ee5e3Chalard Jean
am: 8acc822d6a Change-Id: Ief1615fa116526ddee07a6fbedf78aa8e62035b4
2018-10-18Strategic fix for infinite loopChalard Jean
am: af3d0ee5e3 Change-Id: Ie6596461792dbe3f38b68f12e11cb9dcd0f7b104
2018-10-16Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory.Lorenzo Colitti
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-08-22Strategic fix for infinite loop am: ac93ad333f am: 97e162d899Chalard Jean
am: 6357df8248 Change-Id: Ibdffb4512a74ed8190ec35b696843b6c1abfdf41
2018-08-22Merge "Tiny tiny style fix" am: 0b8a26aec4 am: f6a2564de1Chalard Jean
am: f6011a0609 Change-Id: I8efd2f55388d6a1f917814064b10429c1752b298
2018-08-22Strategic fix for infinite loop am: ac93ad333fChalard Jean
am: 97e162d899 Change-Id: I76d22f4363421aaffd947bb2edf87642fae6fd89
2018-08-22Merge "Tiny tiny style fix" am: 0b8a26aec4Chalard Jean
am: f6a2564de1 Change-Id: If99fe1e18725aff2036e1d967b16be2ba5590f59
2018-08-22Strategic fix for infinite loopChalard Jean
am: ac93ad333f Change-Id: Ib2e7b639986b6f299baafd818494f5bd3f2ffcca
2018-08-22Merge "Tiny tiny style fix"Chalard Jean
am: 0b8a26aec4 Change-Id: I05f2224854a7a78de80da75123695ffbac2e17fd
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 08:05:46 +0000