Robert Greenwalt
|
ed10dede98
|
resolved conflicts for merge of ea54b760 to master am: 423307deb6 am: fdf5058e65 am: 93ac21104b
Original change: undetermined
Change-Id: Ib513d43e2a91c82e69bea243a6f71fbda7378705
|
2021-05-31 12:47:20 +00:00 |
|
The Android Automerger
|
a14f2249a8
|
merge in ics-mr1-release history after reset to ics-mr1 am: 0f7eb3a300 am: 6ea673fc0b am: 4c1fcb153e
Original change: undetermined
Change-Id: I303595f490da2c183c988587eee16ed4e5f7f796
|
2021-05-31 12:47:08 +00:00 |
|
Robert Greenwalt
|
f7e85f8b5d
|
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 am: 9dcad72873 am: 78dd8d7e27 am: f4a83268e3
Original change: undetermined
Change-Id: I6e87011587e192008cb38638fe363bb71363876b
|
2021-05-31 12:46:56 +00:00 |
|
Jeff Sharkey
|
33af728795
|
Correct proc file reader, optimizations. am: e370a59bec am: 38c676d7ce am: c009b2af9d
Original change: undetermined
Change-Id: I31bad5420dad2142c491075b65cbe8c00105df37
|
2021-05-31 12:46:43 +00:00 |
|
Robert Greenwalt
|
a76cf1f845
|
Temp disable Tethering if DUN is required am: 274518a279 am: 22bd5b387a am: 25d059cc4b
Original change: undetermined
Change-Id: I3f842310b93f92e7cebdaff941a5dfdd602edb78
|
2021-05-31 12:46:29 +00:00 |
|
Jeff Sharkey
|
4be480135d
|
Move battery stats to xt_qtaguid for data stats. am: aac2c50385 am: 12789340a4 am: 7b88dd1bdc
Original change: undetermined
Change-Id: I4dda9ee466678a22cdebee565a106f98a9ede28a
|
2021-05-31 12:46:16 +00:00 |
|
Scott Main
|
683e919e5d
|
docs: deprecate thingy am: 5058914700 am: d7e0c60287 am: 27b9a0f463
Original change: undetermined
Change-Id: I4138cf25ff89326e0da99506d1c5f650582c16d5
|
2021-05-31 12:46:03 +00:00 |
|
Chia-chi Yeh
|
817a79c4bd
|
Merge "VPN: temporarily disable the default proxy when VPN is active." am: ec49c91929 am: 19d17dde29 am: 8ac4b8105e
Original change: undetermined
Change-Id: Idbb9e89201506530a60f9819a2eb9eb6f4a36af6
|
2021-05-31 12:45:51 +00:00 |
|
Chia-chi Yeh
|
46b6ee9d09
|
Merge "ConnectivityService: detach the logic of global proxy." am: f386f9ec7e am: 2bd9374bda am: 9aa2940476
Original change: undetermined
Change-Id: I67c7529e15ef6a2f3f3f75a96f1858e3a4ef77a6
|
2021-05-31 12:45:38 +00:00 |
|
Jeff Sharkey
|
7d8bc7f793
|
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom am: 7aaf57609e am: 8459995b62 am: 2e674e1487
Original change: undetermined
Change-Id: I12c167f6ba7e351edba587a106cb1d7e7bfc3879
|
2021-05-31 12:45:25 +00:00 |
|
Jeff Sharkey
|
e5fc83533b
|
Read iface stats from single proc file. am: d49f1a59f9 am: 69fbe294fc am: f3e4dee80b
Original change: undetermined
Change-Id: I3409f35cbe50bf1a76773195267d5ca85ef9e006
|
2021-05-31 12:45:13 +00:00 |
|
Jeff Sharkey
|
e3c02a290a
|
Track xtables summary, move tether stats, time. am: ad268036a4 am: a7cb93ff17 am: 11bf4ff7e4
Original change: undetermined
Change-Id: I82d9c3fbdd66c4e7c8f793df1c5665465a5f7f3e
|
2021-05-31 12:45:00 +00:00 |
|
Lorenzo Colitti
|
a2a0edbac5
|
Revert "Tell the resolver what protocols to use." am: aa035385d3 am: e230672be4 am: 1239d194cb
Original change: undetermined
Change-Id: I88f58afac5d3823fa75f3bfc25cd9e508a678c62
|
2021-05-31 12:44:47 +00:00 |
|
Jeff Sharkey
|
00d8dea4d0
|
Merge "Watch network subtype, tethering teardown, empty." am: 6d38bd1bc3 am: e1ddb1a6ad am: 9b10a50c4f
Original change: undetermined
Change-Id: Ifaf02b0d9d8556e5c2d7f70eae03ec3cd5b3210c
|
2021-05-31 12:44:34 +00:00 |
|
Robert Greenwalt
|
558d19f333
|
am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom am: bc75548c32 am: f42ef7ec79 am: 158a330d6c
Original change: undetermined
Change-Id: Icac6195691dcab1a95c1096ae8c810e22ecdbb24
|
2021-05-31 12:44:20 +00:00 |
|
Wink Saville
|
f4b7e1b1e4
|
am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom am: 693ee83a6c am: 57c597479a am: 3464f001de
Original change: undetermined
Change-Id: Idd81e91cffbb509c71a2503f697ed1ada52bd781
|
2021-05-31 12:44:07 +00:00 |
|
Wink Saville
|
c27fdda831
|
am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom am: 933cb47f64 am: a44ce78998 am: fa2eb2f38a
Original change: undetermined
Change-Id: I49ebac058a3cfe3c8efa27b05789a40bce10060e
|
2021-05-31 12:43:56 +00:00 |
|
Irfan Sheriff
|
1054394a8d
|
Change hostname format to conform to specification am: 4aa0b2ece5 am: 74bf43eba2 am: ee984c104b
Original change: undetermined
Change-Id: I0a422a59dc24e817a5c8f437f110baafe67bac48
|
2021-05-31 12:43:43 +00:00 |
|
Jeff Sharkey
|
657f2b34e1
|
Sample atomic network stats buckets, full poll. am: f444762587 am: c23a30a71e am: 0ca6e41e52
Original change: undetermined
Change-Id: If873f3af0b45e171fb2204503e8ddb86b6970e28
|
2021-05-31 12:43:30 +00:00 |
|
Jeff Sharkey
|
daa0dea853
|
[automerger skipped] am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom am: c611ea2aac am: ad15380803 am: 71acaad1a6 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ib0f2b97e245a71399a920216c61876705680275b
|
2021-05-31 12:43:18 +00:00 |
|
Jeff Sharkey
|
c2c599cf83
|
am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom am: 8f5e775626 am: 49f944fb45 am: 61e9a76e9d
Original change: undetermined
Change-Id: I401df88500cb18e477b7e3375bbfb200a25d314f
|
2021-05-31 12:43:10 +00:00 |
|
JP Abgrall
|
bc30549420
|
NetworkManagement SocketTagger: Migrate QTagUid support to JNI. am: 7682298a7d am: 4f19ad8213 am: 8815a528eb
Original change: undetermined
Change-Id: I3733b394e7cc467aaa083eeccbe611ecd0df5b61
|
2021-05-31 12:42:57 +00:00 |
|
Jeff Sharkey
|
215bdb41e5
|
Merge "Network stats flag to force complete poll." am: 9c57b7f2ef am: d4fc758fa7 am: 29025e553b
Original change: undetermined
Change-Id: Id46b3613c362809b27fa61e2f9751a360349e148
|
2021-05-31 12:42:45 +00:00 |
|
The Android Open Source Project
|
a673d0d13d
|
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release am: 3b30b92fac am: 6d4120a312 am: e6d0cd7a77
Original change: undetermined
Change-Id: I49836c14d9676c46a5e33de0d4f70d0684aa3391
|
2021-05-31 12:42:32 +00:00 |
|
Robert Greenwalt
|
20dd78c5c1
|
am ee4e84b3: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE am: a8d046103a am: 164561bbc2 am: eabcda3610
Original change: undetermined
Change-Id: I0f4229210df6abfd6a05a9e16613f379b413dd61
|
2021-05-31 12:42:20 +00:00 |
|
Jeff Sharkey
|
bfef797052
|
Data usage structure optimizations. am: 4dc0642d32 am: d7ae392db4 am: b514bfd764
Original change: undetermined
Change-Id: I9d5e94c2f66e692a94cc717e16374d20a35894d1
|
2021-05-31 12:42:07 +00:00 |
|
Jeff Sharkey
|
4171dca1c2
|
Poll UID stats during iface changes, enforce idx. am: d1a5951ed9 am: f1614e8d7e am: bec7d088a0
Original change: undetermined
Change-Id: I8f4a7071b007dbf90f26632dc62ca1399dc7f99a
|
2021-05-31 12:41:54 +00:00 |
|
Jeff Sharkey
|
58e179cb4f
|
Merge "Selectively add stats based on iface active state." am: adbe75aaab am: 49b62e5e8a am: 6750ccb8f9
Original change: undetermined
Change-Id: Ibd9fb3a3d821f922d838c18de418764f8cbff68a
|
2021-05-31 12:41:41 +00:00 |
|
Robert Greenwalt
|
68023e1afe
|
Create new isNetworkSupported API am: 0114f6e8e9 am: fa5961f16c am: 57bbe2930f
Original change: undetermined
Change-Id: I13fc0456eb072603db1fee13f1426ac391785e19
|
2021-05-31 12:41:29 +00:00 |
|
Jeff Sharkey
|
a1cf11f357
|
Introduce immediate CONNECTIVITY_ACTION variant. am: 971cd16561 am: 344d294687 am: 049f28489b
Original change: undetermined
Change-Id: I5d9489d9689f93163bf01e197eb2467af8063206
|
2021-05-31 12:41:16 +00:00 |
|
Jeff Sharkey
|
25f044d40e
|
Always splice historical data stats, debug info. am: 0a7279c958 am: 29cb34c774 am: d8e18cdd40
Original change: undetermined
Change-Id: Ie6d7c1fc0fe8b8c028bc5d4043a4081d307bf63b
|
2021-05-31 12:41:03 +00:00 |
|
Jeff Sharkey
|
073cb51390
|
Data usage buckets active time, parsing ISE. am: 3dadd0f1f6 am: c4d71ba00f am: bf61aa30e9
Original change: undetermined
Change-Id: I53157d665d72a3b59e6f2dd76f5c40bf9119754c
|
2021-05-31 12:40:51 +00:00 |
|
Jeff Sharkey
|
9db7fc4d83
|
Register for kernel global data usage alerts. am: d3b657612d am: eb7a74dfee am: 1def8b91e1
Original change: undetermined
Change-Id: Idee97e2349ccb37b965ee10812eb73dc95a54764
|
2021-05-31 12:40:38 +00:00 |
|
Jeff Sharkey
|
64f251bba6
|
Proactively disable data when over policy limit. am: 805662d8fa am: bed13d6e8d am: 9b6e0a3539
Original change: undetermined
Change-Id: Ie1a117275f5c2a68b482f44f6f3770d8ad76cb73
|
2021-05-31 12:40:25 +00:00 |
|
Jeff Sharkey
|
6d24c9f593
|
Merge "Background data notification, API clean up." am: e612a38faa am: e14a53d6ea am: bd646333c7
Original change: undetermined
Change-Id: Idc545edb007c58c754eec01d1b3548df64cf35bf
|
2021-05-31 12:40:12 +00:00 |
|
repo sync
|
f7ba0e4782
|
Merge "P2p enhancements" am: 7c309101fe am: 57d0f41c25 am: 722ac9c440
Original change: undetermined
Change-Id: Ic1d697961d5ddc96b39480e66baf0fa59341ace8
|
2021-05-31 12:40:00 +00:00 |
|
Chia-chi Yeh
|
ce8147d3fb
|
VPN: reset legacy VPN when resetting IPv4 addresses. am: 4a243f5ea1 am: b78bb0ed0a am: cd8f514bb3
Original change: undetermined
Change-Id: I87ba223337214fa880ae182686ea42c38888eea2
|
2021-05-31 12:39:47 +00:00 |
|
Robert Greenwalt
|
bf0e1516e4
|
Merge "Flush central DNS cache when things change." am: 2d5e58e97e am: c188abbf37 am: 5b3c4dd5b2
Original change: undetermined
Change-Id: I9f65721f8170e894cb6182d08a17cbc6811294a9
|
2021-05-31 12:39:34 +00:00 |
|
Jeff Sharkey
|
b56592e582
|
Foreground/background network stats using sets. am: 9c11e89fe2 am: a46cb9a3c9 am: a16e881aa0
Original change: undetermined
Change-Id: I0081a3c8b2dbce327fa9c62f8ddcd658739b8516
|
2021-05-31 12:39:20 +00:00 |
|
Robert Greenwalt
|
38b0a14b18
|
Remove default routes for non-default networks. am: 08ae9bc349 am: ce1b8a4bb2 am: 5f5fbc0293
Original change: undetermined
Change-Id: I4712f957b3887a82a5c867e3fbea054a29903e67
|
2021-05-31 12:39:07 +00:00 |
|
Wink Saville
|
2029d4bf6e
|
resolved conflicts for merge of 0e9cd3b2 to master am: 7e4333cbab am: 6a61f8fbaf am: acaade9ee9
Original change: undetermined
Change-Id: Idb44fc1b617a68a6c96c8c5f1d896b4c454733fa
|
2021-05-31 12:38:56 +00:00 |
|
Jeff Sharkey
|
b8c111de40
|
Merge "Network stats with varint, omit parcel fields." am: 842b3bf16c am: b2d248b9ac am: ace4127b9b
Original change: undetermined
Change-Id: Ib8879773a0a07b9debea95eed3f8d748e8e31417
|
2021-05-31 12:38:43 +00:00 |
|
Irfan Sheriff
|
b295638975
|
Merge "Rewrote DnsPinger - now is async and concurrant" am: fd1ffa4b9f am: 3603824a24 am: d7942100bd
Original change: undetermined
Change-Id: Ida14ccaa3528f5665c42d522486f4a207811f437
|
2021-05-31 12:38:30 +00:00 |
|
Jeff Sharkey
|
657b888a30
|
Merge "Expose quota status for active network." am: f1a83d612f am: 329b5fed1a am: 9b15b76b4a
Original change: undetermined
Change-Id: I97976ba93f287689fcfdb83a76842551853d1d7c
|
2021-05-31 12:38:17 +00:00 |
|
Robert Greenwalt
|
93ac21104b
|
resolved conflicts for merge of ea54b760 to master am: 423307deb6 am: fdf5058e65
Original change: undetermined
Change-Id: Ied12c7b84fd39e6f9cb393fc5c2c021493289a66
|
2021-05-31 12:36:02 +00:00 |
|
The Android Automerger
|
4c1fcb153e
|
merge in ics-mr1-release history after reset to ics-mr1 am: 0f7eb3a300 am: 6ea673fc0b
Original change: undetermined
Change-Id: Ie33be180badfbf31d1506e9c083929caaf22e8cd
|
2021-05-31 12:35:48 +00:00 |
|
Robert Greenwalt
|
f4a83268e3
|
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 am: 9dcad72873 am: 78dd8d7e27
Original change: undetermined
Change-Id: If0a2850bd4b10dcb411f07b772afdba61b244362
|
2021-05-31 12:35:33 +00:00 |
|
Jeff Sharkey
|
c009b2af9d
|
Correct proc file reader, optimizations. am: e370a59bec am: 38c676d7ce
Original change: undetermined
Change-Id: I87c91d6a9c495f9e5f61d2c7e83c3bb1045160d8
|
2021-05-31 12:35:19 +00:00 |
|
Robert Greenwalt
|
25d059cc4b
|
Temp disable Tethering if DUN is required am: 274518a279 am: 22bd5b387a
Original change: undetermined
Change-Id: I4f97a1a02f7f7e33344e50395c8f22942daf6621
|
2021-05-31 12:35:06 +00:00 |
|
Jeff Sharkey
|
7b88dd1bdc
|
Move battery stats to xt_qtaguid for data stats. am: aac2c50385 am: 12789340a4
Original change: undetermined
Change-Id: I0339e7cc717b82cf21c8cd7a7fcef2313fe2a889
|
2021-05-31 12:34:52 +00:00 |
|