Commit Graph

2859 Commits

Author SHA1 Message Date
Benedict Wong
4142c4359b Merge "Relax IPsec resource count restrictions." am: cae8b10659 am: 40cc67b7eb
Change-Id: Iac00f8db5358a3e3ecec848eafd25649bc33028c
2020-03-25 00:07:51 +00:00
Benedict Wong
40cc67b7eb Merge "Relax IPsec resource count restrictions." am: cae8b10659
Change-Id: I18314d4d512ca3d63440ce1287cc651b7dc44231
2020-03-24 23:47:24 +00:00
Benedict Wong
cae8b10659 Merge "Relax IPsec resource count restrictions." 2020-03-24 23:31:37 +00:00
TreeHugger Robot
09b77ea7bf [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: 4c1f620af6 -s ours am: 64712431fb am: 55ad7fd1d2 am: 58a9c9c9a8 -s ours
am skip reason: subject contains skip directive

Change-Id: I6e39faee6f0651a8f0f13ddba6945b5dcb49bd65
2020-03-20 23:24:36 +00:00
TreeHugger Robot
55ad7fd1d2 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: 4c1f620af6 -s ours am: 64712431fb
Change-Id: I0972ebb372991b37c21c7e90a2033b14b21b4860
2020-03-20 18:45:24 +00:00
Xin Li
1859ce035a DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 7b8a4a253f
Change-Id: Ief9788fe26220b3f31d99c46a38aa6992e41d56e
2020-03-20 18:32:31 +00:00
TreeHugger Robot
64712431fb [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: 4c1f620af6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia1f95f590e25c34b4bb6dcf91c06f46a1494c523
2020-03-20 18:31:59 +00:00
android-build-team Robot
63bf691794 Snap for 6315035 from f7d2d9ea601092c7a4c233fefc0ac2cd7d0b9c75 to mainline-release
Change-Id: Ib791564e5501a27725b0618e203fe53edba3a2cb
2020-03-20 07:01:46 +00:00
android-build-team Robot
3b3529b5f4 Snap for 6314400 from 975130e08acdfb708338c99f92e45dd52b793afb to rvc-release
Change-Id: I9395826c82efad441bd953a3c757b4c9f0da081b
2020-03-20 02:08:32 +00:00
Xin Li
7b8a4a253f DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I62d3293f617f630d3d2a3d5f67b764bf272769bf
2020-03-19 10:10:35 -07:00
Lorenzo Colitti
99463819a2 [automerger skipped] Make Ethernet interfaces more testable. am: 8723291cee -s ours am: 5fbe4c856a -s ours am: 26a948dd18 -s ours am: 3d7969d6d6 -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 8723291cee is in history

Change-Id: I5d3f6c85eb7766d4236275a085c82db2b50a2cd4
2020-03-19 15:38:01 +00:00
Lorenzo Colitti
e7dc4b9fa3 [automerger skipped] Make Ethernet interfaces more testable. am: 8723291cee am: fc3330912a -s ours am: 3e3c154772 -s ours am: a7563ccd80 -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 013187d3e3 is in history

Change-Id: I32bbe62f6486773f6596852710f931b768a5e602
2020-03-19 15:37:48 +00:00
Lorenzo Colitti
26a948dd18 [automerger skipped] Make Ethernet interfaces more testable. am: 8723291cee -s ours am: 5fbe4c856a -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 013187d3e3 is in history

Change-Id: I7257757ec5e2ac358746bc3c262917f45fac96fa
2020-03-19 15:00:06 +00:00
Lorenzo Colitti
3e3c154772 [automerger skipped] Make Ethernet interfaces more testable. am: 8723291cee am: fc3330912a -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 013187d3e3 is in history

Change-Id: Ia18110f4eb32f3539533919e65741ef17a66fa05
2020-03-19 14:59:45 +00:00
Lorenzo Colitti
5fbe4c856a [automerger skipped] Make Ethernet interfaces more testable. am: 8723291cee -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 013187d3e3 is in history

Change-Id: I3673d68d69670828a6ecb96073a0d9d2c3d7eca1
2020-03-19 14:44:23 +00:00
Lorenzo Colitti
8723291cee Make Ethernet interfaces more testable.
This CL adds a setIncludeTestInterfaces method to EthernetManager
that, when called, causes the Ethernet service to recognize and
manage test interfaces created by TestNetworkManager.

Bug: 150644681
Test: Tested by EthernetTetheringTest in same topic
Change-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca
Merged-In: I86eef7a93267f800dbfc8eafd307effa76a344ca
(cherry picked from commit 3410fb0aa92bbd4f9d7dc031e89f6f528ff34245)
2020-03-19 12:30:39 +00:00
Lorenzo Colitti
a754e85364 Merge "Make Ethernet interfaces more testable." am: e7ff9d5e6d am: 6b37362b14 am: ddc85d466f am: 7867c10d42 am: 91ade966af
Change-Id: I7319491065d1b1949654b986542a06b203c4145f
2020-03-19 12:19:09 +00:00
Lorenzo Colitti
7867c10d42 Merge "Make Ethernet interfaces more testable." am: e7ff9d5e6d am: 6b37362b14 am: ddc85d466f
Change-Id: Idcb7b2bfef2848d5f90b22b8ff27a087072676ae
2020-03-19 11:49:12 +00:00
Lorenzo Colitti
1543b82a6d Merge "Make Ethernet interfaces more testable." am: e7ff9d5e6d am: 6b37362b14
Change-Id: I4b262fb9cf66a7e1f859e03c7df0fd337658c376
2020-03-19 11:47:03 +00:00
Lorenzo Colitti
ddc85d466f Merge "Make Ethernet interfaces more testable." am: e7ff9d5e6d am: 6b37362b14
Change-Id: I5a73dc5ad6576573bcac6c7ac6f1270dfbb97470
2020-03-19 11:46:55 +00:00
Lorenzo Colitti
6b37362b14 Merge "Make Ethernet interfaces more testable." am: e7ff9d5e6d
Change-Id: I456acb05d548b3d0281e500cfd91d888441d7f94
2020-03-19 11:30:33 +00:00
Lorenzo Colitti
e7ff9d5e6d Merge "Make Ethernet interfaces more testable." 2020-03-19 11:12:09 +00:00
junyulai
f1f3731c01 [automerger skipped] [SM07] Make combine subtype configurable from Settings am: 3faf37539a am: b072165901 -s ours am: 7cacfd59be -s ours am: c547019027 -s ours am: a9452c6808 -s ours
am skip reason: Change-Id Ic94da540afa479ed18f1b6fbda4ae3216c37476b with SHA-1 1e30781571 is in history

Change-Id: I87a9700a2d07d5293e89869f3410289cd15e97e1
2020-03-19 10:46:54 +00:00
junyulai
f751951940 [automerger skipped] [SM05] Enable record mobile network stats by collapsed rat type am: 0a59b1e599 am: ab08ed986a -s ours am: a534cbb409 -s ours am: 75b9985b7b -s ours am: 235c640419 -s ours
am skip reason: Change-Id If330e85330a4ff713dd420c98d42fa741eabd90a with SHA-1 dddf7d0a9a is in history

Change-Id: Ie5523a4747f0a472cdb4c87c65072f4f07b56679
2020-03-19 10:46:52 +00:00
junyulai
2154df2825 [automerger skipped] [SM04] Support fetching data with NetworkTemplate with subType am: 97ea6b222d am: 2f3c57ee95 -s ours am: 4eb7ef04cb -s ours am: 1b7096ae27 -s ours am: da4ff1aff6 -s ours
am skip reason: Change-Id Ie2d229be0b6bd239f799989c070475c73a096d71 with SHA-1 00d94e3335 is in history

Change-Id: I9879f6f9cc1c2362eb4dcbc0838b06b761307558
2020-03-19 10:46:46 +00:00
junyulai
63d4816f0d [automerger skipped] [SM02] Support record mobile network stats by collapsed rat type am: 383c8e8556 am: 3968b6ddb8 -s ours am: e4a78f7f73 -s ours am: b56c78c25d -s ours am: 3825b448c7 -s ours
am skip reason: Change-Id Ic6b2f10f2c8b082820e0662eb9cee70d70d28cd6 with SHA-1 825f0828ac is in history

Change-Id: I7ef1f80cfc3c541b2acc8c157d3efa0b3bc7b142
2020-03-19 10:46:43 +00:00
junyulai
c547019027 [automerger skipped] [SM07] Make combine subtype configurable from Settings am: 3faf37539a am: b072165901 -s ours am: 7cacfd59be -s ours
am skip reason: Change-Id Ic94da540afa479ed18f1b6fbda4ae3216c37476b with SHA-1 1e30781571 is in history

Change-Id: I549da7cb25b1c44594542f528b0ab7b1e4f12a5e
2020-03-19 10:01:32 +00:00
junyulai
75b9985b7b [automerger skipped] [SM05] Enable record mobile network stats by collapsed rat type am: 0a59b1e599 am: ab08ed986a -s ours am: a534cbb409 -s ours
am skip reason: Change-Id If330e85330a4ff713dd420c98d42fa741eabd90a with SHA-1 dddf7d0a9a is in history

Change-Id: Iaa2fc4829906ed688c8ce98c1d7b6cae092abe74
2020-03-19 10:01:29 +00:00
junyulai
1b7096ae27 [automerger skipped] [SM04] Support fetching data with NetworkTemplate with subType am: 97ea6b222d am: 2f3c57ee95 -s ours am: 4eb7ef04cb -s ours
am skip reason: Change-Id Ie2d229be0b6bd239f799989c070475c73a096d71 with SHA-1 00d94e3335 is in history

Change-Id: I5a872bb77589bee31d219be1161e78cf7cef1858
2020-03-19 10:01:26 +00:00
junyulai
b56c78c25d [automerger skipped] [SM02] Support record mobile network stats by collapsed rat type am: 383c8e8556 am: 3968b6ddb8 -s ours am: e4a78f7f73 -s ours
am skip reason: Change-Id Ic6b2f10f2c8b082820e0662eb9cee70d70d28cd6 with SHA-1 825f0828ac is in history

Change-Id: I5eb9f9c3513eebd2a26bca53a943d0e25b0c3557
2020-03-19 10:01:23 +00:00
junyulai
3815d37747 [SM07] Make combine subtype configurable from Settings am: 3faf37539a am: b072165901
Change-Id: I65470e2ce4aae26308a395ce1e5465ac27914f60
2020-03-19 09:40:53 +00:00
junyulai
b8fc0b631d [SM05] Enable record mobile network stats by collapsed rat type am: 0a59b1e599 am: ab08ed986a
Change-Id: Ie23c2131349412d9dae04db122d7b3d14047b87f
2020-03-19 09:40:51 +00:00
junyulai
b58185d835 [SM04] Support fetching data with NetworkTemplate with subType am: 97ea6b222d am: 2f3c57ee95
Change-Id: Ib47b320e467daed3c8fb746ed99dd34657d1799b
2020-03-19 09:40:48 +00:00
junyulai
8fbcf8b99b [SM02] Support record mobile network stats by collapsed rat type am: 383c8e8556 am: 3968b6ddb8
Change-Id: I3a8965424f1f28d1fa63bb469c10c735af67eb31
2020-03-19 09:40:45 +00:00
junyulai
7cacfd59be [automerger skipped] [SM07] Make combine subtype configurable from Settings am: 3faf37539a am: b072165901 -s ours
am skip reason: Change-Id Ic94da540afa479ed18f1b6fbda4ae3216c37476b with SHA-1 1e30781571 is in history

Change-Id: Ife89c4526d5e5f79c09fce585b2f124ea06ff28a
2020-03-19 09:40:00 +00:00
junyulai
a534cbb409 [automerger skipped] [SM05] Enable record mobile network stats by collapsed rat type am: 0a59b1e599 am: ab08ed986a -s ours
am skip reason: Change-Id If330e85330a4ff713dd420c98d42fa741eabd90a with SHA-1 dddf7d0a9a is in history

Change-Id: I5f7e58d16e30eae69c45a505ea2ee9e4a9802d91
2020-03-19 09:39:55 +00:00
junyulai
4eb7ef04cb [automerger skipped] [SM04] Support fetching data with NetworkTemplate with subType am: 97ea6b222d am: 2f3c57ee95 -s ours
am skip reason: Change-Id Ie2d229be0b6bd239f799989c070475c73a096d71 with SHA-1 00d94e3335 is in history

Change-Id: Ibdeeda75e0bd4f641b349b145b0c849bf2cb94c1
2020-03-19 09:39:51 +00:00
junyulai
e4a78f7f73 [automerger skipped] [SM02] Support record mobile network stats by collapsed rat type am: 383c8e8556 am: 3968b6ddb8 -s ours
am skip reason: Change-Id Ic6b2f10f2c8b082820e0662eb9cee70d70d28cd6 with SHA-1 825f0828ac is in history

Change-Id: Idf27a0112486d2e0c5b3be419c01228820d8835e
2020-03-19 09:39:49 +00:00
junyulai
b072165901 [SM07] Make combine subtype configurable from Settings am: 3faf37539a
Change-Id: I0c3f4a02f16eb6a4d9e48fa775bf456707d2b1bb
2020-03-19 09:31:02 +00:00
junyulai
ab08ed986a [SM05] Enable record mobile network stats by collapsed rat type am: 0a59b1e599
Change-Id: If4bcfaefd2244be67449066ef54a6bdc0c00eb86
2020-03-19 09:31:00 +00:00
junyulai
2f3c57ee95 [SM04] Support fetching data with NetworkTemplate with subType am: 97ea6b222d
Change-Id: I3927277c41ba4b0cb5dc3a0309a5d4ca8f4d1dbc
2020-03-19 09:30:56 +00:00
junyulai
3968b6ddb8 [SM02] Support record mobile network stats by collapsed rat type am: 383c8e8556
Change-Id: Ia7dd0ae44fe951c00e365b94ac3b8a93230c96ab
2020-03-19 09:30:51 +00:00
Automerger Merge Worker
65ff4f007f [automerger skipped] Merge changes from topic "am-f21c1521a80d46898a51bd7ed7e64602" into rvc-d1-dev-plus-aosp am: aad54eee5e am: f0125065f1 -s ours
am skip reason: Change-Id I7eaca623adf93f9b8d53c2e5857ecae90ea572ab with SHA-1 4670baace6 is in history

Change-Id: I6c026db038223389a7a31b8e2fb0d2eec211ede3
2020-03-19 07:25:35 +00:00
junyulai
8270ea0a34 [SM07] Make combine subtype configurable from Settings am: 1e30781571 am: 28255c9992
Change-Id: I138ae4305d68b78323c2af9bfc081f42e661cdd9
2020-03-19 06:53:43 +00:00
junyulai
0488bfb9c0 [SM05] Enable record mobile network stats by collapsed rat type am: dddf7d0a9a am: f09a3e232f
Change-Id: I4e700b60a23665e7e50261b6392392c67ea9c49d
2020-03-19 06:53:40 +00:00
junyulai
180663d4d4 [SM04] Support fetching data with NetworkTemplate with subType am: 00d94e3335 am: 5341a72f55
Change-Id: I2f0f04c34faf58bc15572bc41f80b9c411db0242
2020-03-19 06:53:37 +00:00
junyulai
e00a0fdcbc [SM02] Support record mobile network stats by collapsed rat type am: 825f0828ac am: ad8e8bddfe
Change-Id: I10acd170e902344b1b9063fe2a4da60c5d037e5d
2020-03-19 06:53:35 +00:00
junyulai
28255c9992 [SM07] Make combine subtype configurable from Settings am: 1e30781571
Change-Id: Ic8426ae36b5aaadfdd3292a3b70fc9b290443d5c
2020-03-19 06:37:59 +00:00
junyulai
f09a3e232f [SM05] Enable record mobile network stats by collapsed rat type am: dddf7d0a9a
Change-Id: I492dd32dc6b6af061da02a450c8c6abff0e8bf5e
2020-03-19 06:37:56 +00:00
junyulai
5341a72f55 [SM04] Support fetching data with NetworkTemplate with subType am: 00d94e3335
Change-Id: Ie22a2255f1d32b6c0b21a4c33bd6778255e4cbb5
2020-03-19 06:37:51 +00:00