Automerger Merge Worker
662cc3d540
Merge "[SP12] Remove the usage of getVtDataUsage" am: afeed9dee4 am: 7fe2313922 am: ac4706dc7a
...
Change-Id: I28c84ee96a3a209868769aad16a2d2e596a0c342
2020-02-19 23:02:38 +00:00
Automerger Merge Worker
ac4706dc7a
Merge "[SP12] Remove the usage of getVtDataUsage" am: afeed9dee4 am: 7fe2313922
...
Change-Id: Ia10e2365d5f02a1e3444d80e6d7f9d5da00264e0
2020-02-19 00:54:03 +00:00
Automerger Merge Worker
7fe2313922
Merge "[SP12] Remove the usage of getVtDataUsage" am: afeed9dee4
...
Change-Id: I4e617685c887098e5a93905b77455fb42116a99c
2020-02-19 00:33:48 +00:00
Junyu Lai
afeed9dee4
Merge "[SP12] Remove the usage of getVtDataUsage"
2020-02-19 00:13:02 +00:00
android-build-team Robot
14a33bb9ba
Snap for 6214566 from 8ac64bc013a7b14c9996f504eb4c50b6d71c9257 to rvc-release
...
Change-Id: I2dc4f607967f2e9f5baaf624e97aba7085b9b972
2020-02-18 03:19:15 +00:00
Junyu Lai
50e1c228d0
Merge "[SP16] Address comments on aosp/1172143" am: f4eaaa2415 am: d58bf88378 am: 59a0c28cf3
...
Change-Id: I4cff4d096f375210585ceae5eb27002b97a35226
2020-02-17 14:18:32 +00:00
Junyu Lai
ad9585467c
Merge "[SP17] Wait for stats providers to report stats update" am: 1e47a3e71d am: 48433d6735 am: 91c2f32f05
...
Change-Id: I719a1b2c75123f6fa6c765eeced055720c052c9b
2020-02-17 14:18:06 +00:00
android-build-team Robot
8510479a47
Snap for 6210127 from 9fdd67b83988e9db359ed8aa7a35cbb05a1dd683 to rvc-release
...
Change-Id: Id5f80c104b2f94ba79b3f32d1656160de25d7754
2020-02-15 03:12:12 +00:00
Junyu Lai
59a0c28cf3
Merge "[SP16] Address comments on aosp/1172143" am: f4eaaa2415 am: d58bf88378
...
Change-Id: Id6d4be756ec4bd6d3e9c7b8fa1d85b3bdc802a10
2020-02-15 02:51:23 +00:00
Junyu Lai
d58bf88378
Merge "[SP16] Address comments on aosp/1172143" am: f4eaaa2415
...
Change-Id: I9c826c08320e112466dea0d2628f3447ebcb7d02
2020-02-15 02:35:42 +00:00
Junyu Lai
f4eaaa2415
Merge "[SP16] Address comments on aosp/1172143"
2020-02-15 02:21:30 +00:00
Junyu Lai
91c2f32f05
Merge "[SP17] Wait for stats providers to report stats update" am: 1e47a3e71d am: 48433d6735
...
Change-Id: I4b5c9e1cca7641b786e118ff979b33b25394fa3e
2020-02-15 02:03:52 +00:00
Junyu Lai
48433d6735
Merge "[SP17] Wait for stats providers to report stats update" am: 1e47a3e71d
...
Change-Id: I5e6a69fb50c9820f8b0a7e834608a32f651a860a
2020-02-15 01:38:09 +00:00
Benedict Wong
4531c37767
[automerger skipped] Merge "Implement Ikev2VpnRunner" am: e334a83e46 am: c722981400 am: ae8b9c5683 -s ours
...
am skip reason: skipped by user benedictwong
Change-Id: Ie1f6f8dbd10161342a7f14935def73820a68b057
2020-02-14 20:11:15 +00:00
junyulai
304de51561
[SP17] Wait for stats providers to report stats update
...
From current design, the traffic accounted by stats providers
will be updated asynchronously when force polling. When upper
layer make two subsequently queries. They will get stale
stats upon the first query, and may get newest/stale stats
base on the result of race.
Thus, wait for a bit of time to allow asynchronous stats update
complete to reduce the chance of race. In pratice, it would
be finished in ~2ms when testing.
Test: systrace.py network
Test: atest FrameworksNetTests
Bug: 147460444
Change-Id: I22a00fc4049cddf77fd578e25769ae1979f2cc6d
2020-02-14 17:03:35 +08:00
junyulai
4fe16c5214
[SP16] Address comments on aosp/1172143
...
Test: atest FrameworksNetTests
Test: atest NetworkPolicyManagerServiceTest
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Iccaab09f5b9668ec4a7249737c64a69cecb08d15
2020-02-14 16:53:40 +08:00
junyulai
12ddc700c8
[SP12] Remove the usage of getVtDataUsage
...
Currently NetworkStatsService holding a lock when invoking
getVtDataUsage, which causes a lot of deadlock problems since
Phone will also have binder calls to system_server.
Thus, this change uses a new set of API to break such situation,
that allows VT to report stats asynchronously.
Test: atest FrameworksNetTests FrameworksTelephonyTests
Bug: 130855321
Fix: 143923500
Change-Id: Ifdb8599c3bade09208b4730710fc99da1afad71d
2020-02-14 15:37:16 +08:00
android-build-team Robot
ce1ca88d15
Snap for 6206568 from 4e21e319cdf514b6c5a4f5a02eadd5ccd9445772 to rvc-release
...
Change-Id: Ic8d59142f4f9ee94cc49efc47c304087715dbc9a
2020-02-14 03:15:57 +00:00
Benedict Wong
ae8b9c5683
Merge "Implement Ikev2VpnRunner" am: e334a83e46 am: c722981400
...
Change-Id: I0048c33ac9b5b60d2f64a90d7c5d9e5e829cf24d
2020-02-13 21:46:13 +00:00
Benedict Wong
c722981400
Merge "Implement Ikev2VpnRunner" am: e334a83e46
...
Change-Id: I9b966b52f78fa54dca9d8c3032ec26ed853ad572
2020-02-13 21:31:28 +00:00
Benedict Wong
e334a83e46
Merge "Implement Ikev2VpnRunner"
2020-02-13 21:15:24 +00:00
Benedict Wong
c85b7b0114
Implement Ikev2VpnRunner
...
This change adds the implementation for IKEv2/IPsec VPNs.
Bug: 144246767
Test: Manually tested
Change-Id: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76
Merged-In: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76
2020-02-13 18:37:06 +00:00
Benedict Wong
c2eefbb98a
Merge "Implement Ikev2VpnRunner"
2020-02-13 18:36:49 +00:00
Benedict Wong
9ee6603153
Implement Ikev2VpnRunner
...
This change adds the implementation for IKEv2/IPsec VPNs.
Bug: 144246767
Test: Manually tested
Change-Id: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76
2020-02-13 00:33:44 -08:00
Automerger Merge Worker
afff4915ec
Merge "Fix incorrect interpolation of active bucket for partial requests." am: cb011605cf am: 244299e38b am: 16d7a45bfe
...
Change-Id: I3a7df5061e0a2a90231072a5cd3e8c799302b346
2020-02-13 08:26:15 +00:00
Automerger Merge Worker
16d7a45bfe
Merge "Fix incorrect interpolation of active bucket for partial requests." am: cb011605cf am: 244299e38b
...
Change-Id: I1d6aa0c23fd227eca478e4a6ab5fd7dd26e4c297
2020-02-13 08:07:01 +00:00
Automerger Merge Worker
244299e38b
Merge "Fix incorrect interpolation of active bucket for partial requests." am: cb011605cf
...
Change-Id: Ibfaf1e3d13ce758323c30381ba44702b6016d9eb
2020-02-13 07:53:18 +00:00
Maciej Żenczykowski
cb011605cf
Merge "Fix incorrect interpolation of active bucket for partial requests."
2020-02-13 07:37:57 +00:00
android-build-team Robot
888c4ae2f3
Snap for 6203617 from 15f5e4726543664e51c56e578cf5ce69c28d69c2 to rvc-release
...
Change-Id: I650d20270f30567434c4c789f5eb39e2a4a6a826
2020-02-13 04:10:43 +00:00
Automerger Merge Worker
d6bf586774
Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 9d8a9cbfcc am: 9ec52c9fe8 am: 027902a86c
...
Change-Id: I0e7322090364fc1724797641276416c07277d0bc
2020-02-12 05:27:01 +00:00
Automerger Merge Worker
027902a86c
Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 9d8a9cbfcc am: 9ec52c9fe8
...
Change-Id: Icc69f682437baf209aa537820201be45db6ccf3a
2020-02-12 05:11:59 +00:00
Automerger Merge Worker
9ec52c9fe8
Merge "[SP10] Add IntDef annotations for system api of NetworkStats" am: 9d8a9cbfcc
...
Change-Id: I4d352ed54671ce77ebbcaa9f0808a0ef703d3c6f
2020-02-12 04:54:02 +00:00
Treehugger Robot
9d8a9cbfcc
Merge "[SP10] Add IntDef annotations for system api of NetworkStats"
2020-02-12 04:37:55 +00:00
Automerger Merge Worker
1934036da7
Merge "[SP11] add dumpsys support to dump stats inside providers" am: 2b4a6517bf am: e49c7caae3 am: 6c2c1baecf
...
Change-Id: I03ea04d5851ae4f911f9c64dbdb235aedf4cea3c
2020-02-12 03:28:19 +00:00
Automerger Merge Worker
6c2c1baecf
Merge "[SP11] add dumpsys support to dump stats inside providers" am: 2b4a6517bf am: e49c7caae3
...
Change-Id: I7c6bf5cb081fb943777988c4d9f40b36f9a16efb
2020-02-12 03:13:22 +00:00
Automerger Merge Worker
e49c7caae3
Merge "[SP11] add dumpsys support to dump stats inside providers" am: 2b4a6517bf
...
Change-Id: I44f69d27b89c6d0463a5b12b98e0cc3cf8297a33
2020-02-12 02:59:21 +00:00
Treehugger Robot
2b4a6517bf
Merge "[SP11] add dumpsys support to dump stats inside providers"
2020-02-12 02:45:38 +00:00
junyulai
8016a35c78
[SP10] Add IntDef annotations for system api of NetworkStats
...
Test: m -j
Bug: 130855321
Change-Id: I8855ec95d5d086fc14e2eb71558bc2dcd9a830e5
2020-02-11 09:47:03 +00:00
android-build-team Robot
cd3c9697c4
Snap for 6174197 from fe830f9760ca39e90e4f014eee74e53482c9e1c8 to rvc-release
...
Change-Id: If870cd76d591528113d2a70619bab099d642f497
2020-02-01 04:05:55 +00:00
Automerger Merge Worker
a8785a5152
[automerger skipped] Merge changes Iaa6f0d65,I68a16b64 am: e486951a92 am: 8abb5a0520 am: a96f068996 -s ours
...
am skip reason: Change-Id Iaa6f0d65cab556c24b0a9010427de8e6a02836c1 with SHA-1 7092cf164f is in history
Change-Id: I306a831e47c08ac37de93285763500b73a4624ec
2020-01-31 16:47:44 +00:00
Automerger Merge Worker
a96f068996
Merge changes Iaa6f0d65,I68a16b64 am: e486951a92 am: 8abb5a0520
...
Change-Id: I7e66156659fb88110d2a7f027d488e15499caee2
2020-01-31 16:43:27 +00:00
Automerger Merge Worker
8abb5a0520
Merge changes Iaa6f0d65,I68a16b64 am: e486951a92
...
Change-Id: I687e59f2c25d5c5e2cb5b1574dbcf6f32ec8c817
2020-01-31 16:37:49 +00:00
android-build-team Robot
d26a6f301e
Snap for 6172028 from b2e935ae7b0825781b2021da019a476183c49897 to rvc-release
...
Change-Id: Id59887dbc35734b9c1d5a6dcf2974117c4437d6a
2020-01-31 04:11:28 +00:00
David Su
e486951a92
Merge changes Iaa6f0d65,I68a16b64
...
* changes:
Networking: Rename removeDoubleQuotes to sanitizeSsid
Wifi: Rename removeDoubleQuotes to sanitizeSsid
2020-01-30 22:42:16 +00:00
David Su
1596be0133
Merge changes from topic "api-review-removedoublequotes"
...
* changes:
SettingsLib: Rename removeDoubleQuotes to sanitizeSsid
Networking: Rename removeDoubleQuotes to sanitizeSsid
Wifi: Rename removeDoubleQuotes to sanitizeSsid
2020-01-30 18:16:53 +00:00
android-build-team Robot
b325bf3e89
Snap for 6166993 from 6b398d9c3741c8c6664d740dddcb98d5fb8381e2 to rvc-release
...
Change-Id: Ic43525376c351bc28a5081799b3ebde31c8caa43
2020-01-29 04:22:21 +00:00
Automerger Merge Worker
82f4cb1794
[automerger skipped] Merge changes I34842acd,Icc6c4d6b am: 5312d0be3e am: 4036bb43a0 am: 145a512dd2 -s ours
...
am skip reason: Change-Id I34842acd94b972e440c3622f7617df10c18acf65 with SHA-1 c5c664b88d is in history
Change-Id: I7068557f0d30c9066e9bdcb2dd674dab8964a4b9
2020-01-28 11:18:31 +00:00
Automerger Merge Worker
145a512dd2
Merge changes I34842acd,Icc6c4d6b am: 5312d0be3e am: 4036bb43a0
...
Change-Id: I801ab058c34ed261f6ca4d100927a0cd89fd8e02
2020-01-28 11:03:56 +00:00
Lorenzo Colitti
4036bb43a0
Merge changes I34842acd,Icc6c4d6b
...
am: 5312d0be3e
Change-Id: I38f5452905216ebf9e0b28311d34ad0667243274
2020-01-28 02:53:38 -08:00
Lorenzo Colitti
5312d0be3e
Merge changes I34842acd,Icc6c4d6b
...
* changes:
Add support for Ethernet tethering
Local Tethering with ncm interface
2020-01-28 10:43:33 +00:00