Commit Graph

2666 Commits

Author SHA1 Message Date
Benedict Wong
3ebc200d00 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 529e8aae25 is in history

Change-Id: I10aae07c044231d9b6fcdd61488a146b21d8dd8f
2020-03-31 17:03:21 +00:00
junyulai
eba72cd4ef [SM06] Collect mobile NetworkStats metrics by collapsed rat type
Test: adb shell cmd stats pull-source 10000~10003
      adb shell dumpsys netstats --uid
Bug: 129082217

Change-Id: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
Merged-In: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
(cherry picked from commit c82dfeb4225e1a8a17eedc969a90f921e0bf845c)
2020-03-31 09:25:27 +00:00
android-build-team Robot
6d31d03ee0 Snap for 6349563 from 366b79483cc59e01723e782ce103d94db7feda72 to mainline-release
Change-Id: Ic45dcd2ecb2f15642261f4aeed488e0550f749fb
2020-03-31 07:09:36 +00:00
android-build-team Robot
756c7d52e4 Snap for 6348860 from 28fa2620497efc7b590d6e8eec5d3a11afaea48e to rvc-release
Change-Id: I1734224041e259bce83b032d83750cc1536d4ddb
2020-03-31 02:14:16 +00:00
Lorenzo Colitti
fbb7fba3dc [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 -s ours am: 05f0ce2252 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: Ie2e40c3f320e57aee92dc6da90c79f324c5166dd
2020-03-30 19:03:34 +00:00
Lorenzo Colitti
05f0ce2252 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 7bcf9c28ac is in history

Change-Id: If0b5a493a4a8555a4ba40ab9c8a1ed528bd5343a
2020-03-30 18:51:03 +00:00
Lorenzo Colitti
96d80818a8 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 am: 1408ee6d06 am: c8e8cdfe62 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 7bcf9c28ac is in history

Change-Id: Ia9374a882a56ab6bac075931dc65409717ab2e84
2020-03-30 18:11:42 +00:00
Lorenzo Colitti
8375dbdb87 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 7bcf9c28ac is in history

Change-Id: Icb265e846177c8ee1013529034534f46dec4de47
2020-03-30 07:06:45 +00:00
Daulet Zhanguzin
b59e6dbe5f [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf am: 35045271d1 -s ours am: a62847119f -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 c120601182 is in history

Change-Id: I99ef30e8307aca34d78d1beb733b1ecd1b8d402e
2020-03-27 12:34:23 +00:00
Daulet Zhanguzin
a62847119f [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf am: 35045271d1 -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 c120601182 is in history

Change-Id: Ib70273007ee56039d0645f33f59c677ea5f7b1aa
2020-03-27 12:28:12 +00:00
Daulet Zhanguzin
b87f6cd89c Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf am: 35045271d1
Change-Id: I024e79fc24b8962ff6bd10e4b7c7fc4ad13cbf27
2020-03-27 12:27:58 +00:00
Daulet Zhanguzin
35045271d1 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: f8098ddadf
Change-Id: I9f9ba24036e19f568942466c866c7be23112c10a
2020-03-27 12:07:53 +00:00
Daulet Zhanguzin
a12c44da4d Replace com.android.internal.util.Preconditions.checkNotNull with
java.util.Objects.requireNonNull

Bug: 126528330
Bug: 149348618

Test: Treehugger
Change-Id: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
Merged-In: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
2020-03-26 12:44:56 +00:00
Benedict Wong
3fafd684c5 Automatically set IPsec tunnel interface as up
This change makes IPsec tunnel interfaces automatically get brought up
once they are created. Originally this was considered to be an
additional safety check, as they would not be start routing traffic
until explicitly brought up. However, in the intervening time, the
NetworkManagementController now requires the NETWORK_STACK permission to
set an interface as up. Additionally, that call is a hidden API, and
thus not usable for use cases such as IWLAN.

Bug: 149348618
Test: FrameworksNetTests, CtsNetTestCases passing.
Change-Id: I55b63a748463a388e1e2991d2d5d6b3023545e60
Merged-In: I55b63a748463a388e1e2991d2d5d6b3023545e60
(cherry picked from commit 7c5704d177a903034ae1b6ae4800cc3b8457977a)
2020-03-25 06:14:13 +00:00
Automerger Merge Worker
fd266f85b6 Relax IPsec resource count restrictions.
IPsec resource counts were selected to be conservative, due to unknowns
about device capabilities. Since then, it appears that we no longer need
such stringent quotas, and this can be relaxed.

Bug: 152368091
Test: FrameworksNetTest passing
Change-Id: Id53d14e5698e5fcc410868424176b00350c7ae79
Merged-In: Id53d14e5698e5fcc410868424176b00350c7ae79
(cherry picked from commit 224699fc0b485dd75e6157a88f66a53d64e5a6fd)
2020-03-25 06:07:24 +00:00
Benedict Wong
36cbb00f6b Merge "Automatically set IPsec tunnel interface as up" am: 1f1da2083a am: 1e6fcb32b1 am: 43a6ad2f9e
Change-Id: Ibcc7a955dcd48cab57ff5d4c6d5e918d825f2733
2020-03-25 05:16:24 +00:00
Benedict Wong
0fe6df858e Merge "Automatically set IPsec tunnel interface as up" am: 1f1da2083a am: 1e6fcb32b1
Change-Id: Iea78d37e17961a755194e42a85fe7ab92c20c4fb
2020-03-25 05:01:42 +00:00
Benedict Wong
43a6ad2f9e Merge "Automatically set IPsec tunnel interface as up" am: 1f1da2083a am: 1e6fcb32b1
Change-Id: I01d10d2e1c0fcc52b88901609fae068d6d5268f7
2020-03-25 05:01:20 +00:00
Benedict Wong
1e6fcb32b1 Merge "Automatically set IPsec tunnel interface as up" am: 1f1da2083a
Change-Id: I068814590192decaf353cdd8c46cc7f65badc746
2020-03-25 04:35:03 +00:00
Benedict Wong
1f1da2083a Merge "Automatically set IPsec tunnel interface as up" 2020-03-25 04:18:50 +00:00
Benedict Wong
9c4df64d77 Merge "Relax IPsec resource count restrictions." am: cae8b10659 am: 40cc67b7eb am: 60f9dc1cf1
Change-Id: I630677ddb7a27868279a9b1669d41bd6279e38eb
2020-03-25 00:10:31 +00:00
Benedict Wong
60f9dc1cf1 Merge "Relax IPsec resource count restrictions." am: cae8b10659 am: 40cc67b7eb
Change-Id: I1b0b3dcff81c226a4ffc123c974f1a0e89ca6b89
2020-03-25 00:07:52 +00:00
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
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
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
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
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