Commit Graph

3349 Commits

Author SHA1 Message Date
TreeHugger Robot
de5bb18c21 Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 8444a9440f
Change-Id: I70609ad40ecb40a8b6b352e6789a4900313f91fb
2020-04-01 01:29:09 +00:00
TreeHugger Robot
8444a9440f Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev 2020-04-01 01:12:41 +00:00
Benedict Wong
c28cbabd80 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours am: 3ebc200d00 -s ours am: f3763681e4 -s ours am: 407024c9c1 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 3fafd684c5 is in history

Change-Id: I0a3794c9dd040a89f1cf812239ba3fe83001bbe6
2020-03-31 21:42:37 +00:00
Benedict Wong
407024c9c1 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours am: 3ebc200d00 -s ours am: f3763681e4 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 3fafd684c5 is in history

Change-Id: I7403a396513cbd4990c444971714a9215712e766
2020-03-31 20:37:34 +00:00
Benedict Wong
f3763681e4 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 -s ours am: 3ebc200d00 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 3fafd684c5 is in history

Change-Id: I8e5cf4b83f05068ca2715b9715204af268320ca0
2020-03-31 20:15:44 +00:00
Lorenzo Colitti
eb28d9bbed [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours am: 8375dbdb87 -s ours am: 5b8a95cb93 -s ours am: 8e6d7b26de -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: I018efada4643936ea8e528b83c3f49dcebb0ef72
2020-03-31 18:46:16 +00:00
Lorenzo Colitti
8e6d7b26de [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours am: 8375dbdb87 -s ours am: 5b8a95cb93 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: Ibd673f45a1f294c637a81e93b43d38c79f64f6ee
2020-03-31 18:02:46 +00:00
Benedict Wong
725f07f1a3 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 am: 175fa3c682 -s ours am: 95f6343d7a -s ours am: 1bd41c7f71 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 529e8aae25 is in history

Change-Id: Idd284ae5b7213d78e72368db6744f55bff651b91
2020-03-31 18:01:25 +00:00
Lorenzo Colitti
5b8a95cb93 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 -s ours am: 8375dbdb87 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: I55dc1361e00724cce808fec175d57281e88d28ac
2020-03-31 17:52:51 +00:00
Benedict Wong
1bd41c7f71 [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 am: 175fa3c682 -s ours am: 95f6343d7a -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 529e8aae25 is in history

Change-Id: I669f28648e3d6c912ab48df415e164def0c9a1a2
2020-03-31 17:40:17 +00:00
Benedict Wong
95f6343d7a [automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b053 am: 175fa3c682 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 529e8aae25 is in history

Change-Id: I192079b09c3fc9292fabc2208059f2c8698a9e4d
2020-03-31 17:35:12 +00:00
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
Lorenzo Colitti
8247831b24 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 -s ours am: 05f0ce2252 -s ours am: fbb7fba3dc -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 fd266f85b6 is in history

Change-Id: Ib40d0bf61e0e78c405634aa5574495c7e698bf2b
2020-03-31 04:56:21 +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
f3bb0fca00 [automerger skipped] Merge "Relax IPsec resource count restrictions." into rvc-dev am: 0741d3b855 am: 52ad9bedc6 am: 1408ee6d06 am: c8e8cdfe62 -s ours am: 96d80818a8 -s ours
am skip reason: Change-Id Id53d14e5698e5fcc410868424176b00350c7ae79 with SHA-1 7bcf9c28ac is in history

Change-Id: Ib5e5c30d86417e016993f62f88fe46a231b57488
2020-03-30 19:15:21 +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
82bfa3f766 [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: b59e6dbe5f -s ours am: a04943be00 -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 c120601182 is in history

Change-Id: Icc9901c1d50f58b51cfc3ba62939c1c2cb490983
2020-03-27 12:59:52 +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
Junyu Lai
69033b1310 Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" 2020-03-27 03:25:20 +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
0c644b01b6 Merge "Automatically set IPsec tunnel interface as up" am: 1f1da2083a am: 1e6fcb32b1 am: 43a6ad2f9e am: 36cbb00f6b am: e69fbba61e
Change-Id: Ic6be8ec416d371c75328c178ae58758d737605f7
2020-03-25 05:50:51 +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
junyulai
149a1cefe3 [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
2020-03-25 10:51:02 +08:00
Automerger Merge Worker
1c8508a174 Merge "Merge "Relax IPsec resource count restrictions." am: cae8b10659 am: 40cc67b7eb am: 60f9dc1cf1" into rvc-d1-dev-plus-aosp am: 4088e221e1 am: 1e7561700e
Change-Id: I1c5fdb5dcbce1e5c400ce12eaa52717ac54bf28f
2020-03-25 00:49:05 +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
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