The Android Open Source Project
|
693c5d37f4
|
Reconcile with ics-mr0-release ics-mr1-release am: 20ca0d4cf0 am: 1af2ae0ad6
Original change: undetermined
Change-Id: Ieb115180e40231c90928abf631ab2a75bd8084ee
|
2021-05-31 12:48:59 +00:00 |
|
Jeff Sharkey
|
7fe1c69051
|
am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 am: ac0fb9c578 am: bea7833f50
Original change: undetermined
Change-Id: Ia4667eca5e7858b58910a3bc6bfac9dbd74f486c
|
2021-05-31 12:48:45 +00:00 |
|
Robert Greenwalt
|
75a6d7a443
|
am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService. am: 28e752f026 am: 8016e0fd02
Original change: undetermined
Change-Id: I2fce483d33723b75b637ed9f118b6de55148d2a7
|
2021-05-31 12:37:23 +00:00 |
|
Scott Main
|
cbb65b08fe
|
Merge "docs: some helpful javadocs for network info" am: 27ea83f6f2 am: e8c768780d
Original change: undetermined
Change-Id: Ic39bd8ae9bfe80cd78f5b61ffc484d3bd4811f47
|
2021-05-31 12:37:09 +00:00 |
|
Akwasi Boateng
|
dc9b76ecb1
|
am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp am: 6cd46ce696 am: fbb5785f55
Original change: undetermined
Change-Id: If662f7af3a8c63094c5eb0b8d086d6e1384b0b8a
|
2021-05-31 12:36:56 +00:00 |
|
The Android Open Source Project
|
82f271b611
|
Reconcile with ics-mr1-release am: ad8c5483de am: f540614bbb
Original change: undetermined
Change-Id: Icae32c0e0808f0f5842e485f0129d346f3bacfd1
|
2021-05-31 12:36:43 +00:00 |
|
Jeff Sharkey
|
4c7f7cb6fd
|
am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 am: dbb59f22db am: 98b19508dc
Original change: undetermined
Change-Id: Iaf6ceac7a566aca7798bb2b442e08de55657f284
|
2021-05-31 12:36:29 +00:00 |
|
Robert Greenwalt
|
2a661c88e6
|
am 604019c8: Merge "Fix build." into ics-mr1 am: 2511c7a555 am: 3f16703e6a
Original change: undetermined
Change-Id: I5ce7aa9d3c1fa8baf6d7cc2cdcc9d7ff26071cb9
|
2021-05-31 12:36:16 +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 |
|
Scott Main
|
27b9a0f463
|
docs: deprecate thingy am: 5058914700 am: d7e0c60287
Original change: undetermined
Change-Id: Ib4a757e6eec0b86d4da0708c77dcdc99e41264d2
|
2021-05-31 12:34:38 +00:00 |
|
Chia-chi Yeh
|
8ac4b8105e
|
Merge "VPN: temporarily disable the default proxy when VPN is active." am: ec49c91929 am: 19d17dde29
Original change: undetermined
Change-Id: I02f436ee93438712ac2ff9a5f8fcfbb228703af3
|
2021-05-31 12:34:24 +00:00 |
|
Chia-chi Yeh
|
9aa2940476
|
Merge "ConnectivityService: detach the logic of global proxy." am: f386f9ec7e am: 2bd9374bda
Original change: undetermined
Change-Id: I6d2990367a02202877408cb4396c08dacd21396b
|
2021-05-31 12:34:10 +00:00 |
|
Jeff Sharkey
|
2e674e1487
|
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom am: 7aaf57609e am: 8459995b62
Original change: undetermined
Change-Id: I3c7e68efcdc17a324d5eb4ce8c589703988ff89a
|
2021-05-31 12:33:57 +00:00 |
|
Jeff Sharkey
|
f3e4dee80b
|
Read iface stats from single proc file. am: d49f1a59f9 am: 69fbe294fc
Original change: undetermined
Change-Id: Ia2f1763657407d9e3d17413ac10d1a6519201740
|
2021-05-31 12:33:42 +00:00 |
|
Jeff Sharkey
|
11bf4ff7e4
|
Track xtables summary, move tether stats, time. am: ad268036a4 am: a7cb93ff17
Original change: undetermined
Change-Id: I5c66cabbc7176b14eb399262f22ba1b914e7a04d
|
2021-05-31 12:33:28 +00:00 |
|
Lorenzo Colitti
|
1239d194cb
|
Revert "Tell the resolver what protocols to use." am: aa035385d3 am: e230672be4
Original change: undetermined
Change-Id: Iaa95ad8317ff45955a1bda3da2046633ba342edf
|
2021-05-31 12:33:14 +00:00 |
|
Jeff Sharkey
|
9b10a50c4f
|
Merge "Watch network subtype, tethering teardown, empty." am: 6d38bd1bc3 am: e1ddb1a6ad
Original change: undetermined
Change-Id: Ia6fd3355437691923f8444b0852bb75ebea680c8
|
2021-05-31 12:33:00 +00:00 |
|
Robert Greenwalt
|
158a330d6c
|
am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom am: bc75548c32 am: f42ef7ec79
Original change: undetermined
Change-Id: I411ec7eba6494ed3325ebaee33469912528a70b5
|
2021-05-31 12:32:46 +00:00 |
|
Wink Saville
|
3464f001de
|
am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom am: 693ee83a6c am: 57c597479a
Original change: undetermined
Change-Id: I90aff7e9c57009022d7d64b56fbec906eaffd4d4
|
2021-05-31 12:32:33 +00:00 |
|
Wink Saville
|
fa2eb2f38a
|
am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom am: 933cb47f64 am: a44ce78998
Original change: undetermined
Change-Id: Ifd76df1be397101007bdb9b7703626af87c62f83
|
2021-05-31 12:32:20 +00:00 |
|
Irfan Sheriff
|
ee984c104b
|
Change hostname format to conform to specification am: 4aa0b2ece5 am: 74bf43eba2
Original change: undetermined
Change-Id: I5090ecfd1989abdadd3e7b0ecc2e59110cf05190
|
2021-05-31 12:32:06 +00:00 |
|
Jeff Sharkey
|
0ca6e41e52
|
Sample atomic network stats buckets, full poll. am: f444762587 am: c23a30a71e
Original change: undetermined
Change-Id: Ia15c8a6a00fc889424eda89f00159c52c2ab4b45
|
2021-05-31 12:31:52 +00:00 |
|
Jeff Sharkey
|
71acaad1a6
|
am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom am: c611ea2aac am: ad15380803
Original change: undetermined
Change-Id: Ic51e72e74ff776669dc214b06f7294e0accb8803
|
2021-05-31 12:31:37 +00:00 |
|
Jeff Sharkey
|
61e9a76e9d
|
am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom am: 8f5e775626 am: 49f944fb45
Original change: undetermined
Change-Id: I43022a44c0b6979272f3735d5b33cacb984b631e
|
2021-05-31 12:31:23 +00:00 |
|
JP Abgrall
|
8815a528eb
|
NetworkManagement SocketTagger: Migrate QTagUid support to JNI. am: 7682298a7d am: 4f19ad8213
Original change: undetermined
Change-Id: I05d1062c3f5ffe20fd7de8584476a884f7e99cce
|
2021-05-31 12:31:09 +00:00 |
|
Jeff Sharkey
|
29025e553b
|
Merge "Network stats flag to force complete poll." am: 9c57b7f2ef am: d4fc758fa7
Original change: undetermined
Change-Id: I74c1524853af595baf4e1628a76b9c934ccbc551
|
2021-05-31 12:30:55 +00:00 |
|
The Android Open Source Project
|
e6d0cd7a77
|
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release am: 3b30b92fac am: 6d4120a312
Original change: undetermined
Change-Id: Icd5a0f3a0b00e60d1c07dec365a32e7cf0f0b735
|
2021-05-31 12:30:42 +00:00 |
|
Robert Greenwalt
|
eabcda3610
|
am ee4e84b3: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE am: a8d046103a am: 164561bbc2
Original change: undetermined
Change-Id: Id78b903f0618bd7caa34fad6b080f3c0b7ddf713
|
2021-05-31 12:30:28 +00:00 |
|
Jeff Sharkey
|
b514bfd764
|
Data usage structure optimizations. am: 4dc0642d32 am: d7ae392db4
Original change: undetermined
Change-Id: If96c0eaec3865ec27d9aff119c6e62c11e8d34f5
|
2021-05-31 12:30:14 +00:00 |
|
Jeff Sharkey
|
bec7d088a0
|
Poll UID stats during iface changes, enforce idx. am: d1a5951ed9 am: f1614e8d7e
Original change: undetermined
Change-Id: I6cf7f4e78094181deca64d8ee22eb10765d69994
|
2021-05-31 12:30:00 +00:00 |
|
Jeff Sharkey
|
6750ccb8f9
|
Merge "Selectively add stats based on iface active state." am: adbe75aaab am: 49b62e5e8a
Original change: undetermined
Change-Id: If27ac9e67e69fadb37cf33858a13fde64cfa8ede
|
2021-05-31 12:29:46 +00:00 |
|
Robert Greenwalt
|
57bbe2930f
|
Create new isNetworkSupported API am: 0114f6e8e9 am: fa5961f16c
Original change: undetermined
Change-Id: Ieaaea5f77b14eac3a7022c48c5cb5f41f9e89b85
|
2021-05-31 12:29:32 +00:00 |
|
Jeff Sharkey
|
049f28489b
|
Introduce immediate CONNECTIVITY_ACTION variant. am: 971cd16561 am: 344d294687
Original change: undetermined
Change-Id: I382fc5bc0f1351df201b45f7a4cebfb37a91861d
|
2021-05-31 12:29:19 +00:00 |
|
Jeff Sharkey
|
d8e18cdd40
|
Always splice historical data stats, debug info. am: 0a7279c958 am: 29cb34c774
Original change: undetermined
Change-Id: I9679eb609199e2f0539dc7367072e3e39b824a6c
|
2021-05-31 12:29:05 +00:00 |
|
Jeff Sharkey
|
bf61aa30e9
|
Data usage buckets active time, parsing ISE. am: 3dadd0f1f6 am: c4d71ba00f
Original change: undetermined
Change-Id: Ida379891b0eb87105f654fbbbec3d95cd6c1b231
|
2021-05-31 12:28:51 +00:00 |
|
Jeff Sharkey
|
1def8b91e1
|
Register for kernel global data usage alerts. am: d3b657612d am: eb7a74dfee
Original change: undetermined
Change-Id: I75d1116f404fee787c99b47e263ddce213de690c
|
2021-05-31 12:28:37 +00:00 |
|
Jeff Sharkey
|
9b6e0a3539
|
Proactively disable data when over policy limit. am: 805662d8fa am: bed13d6e8d
Original change: undetermined
Change-Id: I92542dec945c7bd4874d5d0ad04ab8d6fa381cbc
|
2021-05-31 12:28:22 +00:00 |
|
Jeff Sharkey
|
bd646333c7
|
Merge "Background data notification, API clean up." am: e612a38faa am: e14a53d6ea
Original change: undetermined
Change-Id: Idbeb6cb8b6757b7fce0fb5588f6127695924680b
|
2021-05-31 12:28:08 +00:00 |
|
repo sync
|
722ac9c440
|
Merge "P2p enhancements" am: 7c309101fe am: 57d0f41c25
Original change: undetermined
Change-Id: I9cbc2ddd2c1a9dab47d27359b2f7963573e33b54
|
2021-05-31 12:27:55 +00:00 |
|
Chia-chi Yeh
|
cd8f514bb3
|
VPN: reset legacy VPN when resetting IPv4 addresses. am: 4a243f5ea1 am: b78bb0ed0a
Original change: undetermined
Change-Id: Ie2e885c3522d55b0e3d3b5055d512c6097e41bf2
|
2021-05-31 12:27:41 +00:00 |
|
Robert Greenwalt
|
5b3c4dd5b2
|
Merge "Flush central DNS cache when things change." am: 2d5e58e97e am: c188abbf37
Original change: undetermined
Change-Id: I98c6451d28a5a0c1302f26aa5623ab35a6d76e49
|
2021-05-31 12:27:27 +00:00 |
|
Jeff Sharkey
|
a16e881aa0
|
Foreground/background network stats using sets. am: 9c11e89fe2 am: a46cb9a3c9
Original change: undetermined
Change-Id: Iaf708969f2af71db69ce93face66148451a86967
|
2021-05-31 12:27:13 +00:00 |
|
Robert Greenwalt
|
5f5fbc0293
|
Remove default routes for non-default networks. am: 08ae9bc349 am: ce1b8a4bb2
Original change: undetermined
Change-Id: I8a93e901e6fc0865687422144609c8463bce5c05
|
2021-05-31 12:26:59 +00:00 |
|
Wink Saville
|
acaade9ee9
|
resolved conflicts for merge of 0e9cd3b2 to master am: 7e4333cbab am: 6a61f8fbaf
Original change: undetermined
Change-Id: I452befb2c37ccf653fb84ef68d54e3e32a38db07
|
2021-05-31 12:26:46 +00:00 |
|
Jeff Sharkey
|
ace4127b9b
|
Merge "Network stats with varint, omit parcel fields." am: 842b3bf16c am: b2d248b9ac
Original change: undetermined
Change-Id: I742ac9b821008624431f2da4a95a630b06f67e2e
|
2021-05-31 12:26:32 +00:00 |
|