Robert Greenwalt
|
e2dde0b530
|
Merge "Stop using shared DUN APN when tethering stops." am: 83b1fc9643
Original change: undetermined
Change-Id: I9f480879fb9d1ca43636839c6496447ed0d1167a
|
2021-05-31 05:13:36 +00:00 |
|
Robert Greenwalt
|
6154d747ae
|
am 21eba066: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 am: 6ed1f684fd
Original change: undetermined
Change-Id: Ibeb4e49e8b4931625e3adb3f3473274afd6a5384
|
2021-05-31 05:13:13 +00:00 |
|
Steve Block
|
c12a838823
|
[automerger skipped] Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE am: 1be767cf74 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ib9006d34fcf47c98d128ad950018dbeed6882b41
|
2021-05-31 05:13:01 +00:00 |
|
Jeff Sharkey
|
67050d2b7b
|
Restrict app data on metered networks. am: bcd1e340c6
Original change: undetermined
Change-Id: I6a872c950b0286379490c84c1e86d74d0565fbcd
|
2021-05-31 05:12:51 +00:00 |
|
The Android Open Source Project
|
59bc00fb79
|
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release am: 691bc744b0
Original change: undetermined
Change-Id: Ia38ed56af5822e811f91d9fa68d038808b64e4b5
|
2021-05-31 05:12:39 +00:00 |
|
Robert Greenwalt
|
9e426ff818
|
am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 am: 60660ab0f4
Original change: undetermined
Change-Id: Ie2f156d71caa0e526355f73fa8d7d0b0ddbaf39d
|
2021-05-31 05:12:25 +00:00 |
|
Robert Greenwalt
|
b340c28cd2
|
am e55e5b84: am 3dba4353: Fix the build. am: 177cac90d0
Original change: undetermined
Change-Id: I7d16bb4ce1de722eeab27b60a49895a175632fc7
|
2021-05-31 05:12:11 +00:00 |
|
Robert Greenwalt
|
02b0ad644b
|
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 am: 0b3d2a85b1
Original change: undetermined
Change-Id: Iaa8fc15e8597dd59f815c7d5c2ccb3bfcb7648c9
|
2021-05-31 05:11:56 +00:00 |
|
The Android Open Source Project
|
42d8561019
|
Reconcile with ics-mr0-release ics-mr1-release am: 20ca0d4cf0
Original change: undetermined
Change-Id: Ib4e35a6fedc89fd91c5aea0827c44209bcc91913
|
2021-05-31 05:11:43 +00:00 |
|
Jeff Sharkey
|
eea17d98c7
|
am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 am: ac0fb9c578
Original change: undetermined
Change-Id: Iab5982ba6fe59ee1f088376b4e4a022668d33671
|
2021-05-31 05:11:30 +00:00 |
|
Robert Greenwalt
|
c7f1a68807
|
am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService. am: 28e752f026
Original change: undetermined
Change-Id: I0e41d51ee930dab7774585ecbb7372b6fac70c64
|
2021-05-31 05:11:16 +00:00 |
|
Scott Main
|
983517faf2
|
Merge "docs: some helpful javadocs for network info" am: 27ea83f6f2
Original change: undetermined
Change-Id: I035294888af28d092fb3cc8fa6c9b1af5755ee95
|
2021-05-31 05:11:01 +00:00 |
|
Akwasi Boateng
|
987868872d
|
am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp am: 6cd46ce696
Original change: undetermined
Change-Id: I4da8584d778afd88e12943343dd3b66d090972b1
|
2021-05-31 05:10:39 +00:00 |
|
The Android Open Source Project
|
e555523869
|
Reconcile with ics-mr1-release am: ad8c5483de
Original change: undetermined
Change-Id: I8e5df3ff1fe32080aafcb975f5b24b171aea6763
|
2021-05-31 05:10:26 +00:00 |
|
Jeff Sharkey
|
2507a1d400
|
am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 am: dbb59f22db
Original change: undetermined
Change-Id: Id181c8361f35fa9118afd513d91e077c3f0c26c4
|
2021-05-31 05:10:12 +00:00 |
|
Robert Greenwalt
|
0533e871a8
|
am 604019c8: Merge "Fix build." into ics-mr1 am: 2511c7a555
Original change: undetermined
Change-Id: I08ab4740f03515a4c53d7ac0738ed5987402448d
|
2021-05-31 05:09:58 +00:00 |
|
Robert Greenwalt
|
bb0842dbb3
|
resolved conflicts for merge of ea54b760 to master am: 423307deb6
Original change: undetermined
Change-Id: Ie28ccba6602ca427976cd2bdc969d1d941559d76
|
2021-05-31 05:09:43 +00:00 |
|
The Android Automerger
|
ecab9156cf
|
merge in ics-mr1-release history after reset to ics-mr1 am: 0f7eb3a300
Original change: undetermined
Change-Id: Idfc624100cf2cbebf1a019190199c2829727392b
|
2021-05-31 05:09:30 +00:00 |
|
Robert Greenwalt
|
6f0011c32f
|
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 am: 9dcad72873
Original change: undetermined
Change-Id: I333a2d9ba57a91ea48d988318cb36b4283f8318b
|
2021-05-31 05:09:16 +00:00 |
|
Jeff Sharkey
|
6f8c3d1a3c
|
Correct proc file reader, optimizations. am: e370a59bec
Original change: undetermined
Change-Id: I116a1ec886f58e9f6a62519cc7ded0d58a914f08
|
2021-05-31 05:09:02 +00:00 |
|
Robert Greenwalt
|
7dba8bdd49
|
Temp disable Tethering if DUN is required am: 274518a279
Original change: undetermined
Change-Id: I311d7a4a46dac13c1ef928e83bc8e80e684123a7
|
2021-05-31 05:08:49 +00:00 |
|
Jeff Sharkey
|
fec3e40f7b
|
Move battery stats to xt_qtaguid for data stats. am: aac2c50385
Original change: undetermined
Change-Id: Ibce3fe31b4a735227a1b4376d84bde4fc8d29a47
|
2021-05-31 05:08:35 +00:00 |
|
Scott Main
|
d7465933ef
|
docs: deprecate thingy am: 5058914700
Original change: undetermined
Change-Id: If7fd5b45ee45e68f5d1790432bd125cd1f470af0
|
2021-05-31 05:08:21 +00:00 |
|
Chia-chi Yeh
|
ad19e5b398
|
Merge "VPN: temporarily disable the default proxy when VPN is active." am: ec49c91929
Original change: undetermined
Change-Id: I7d7b09bd8902ca64c7c814276d857561a486f40a
|
2021-05-31 05:08:07 +00:00 |
|
Chia-chi Yeh
|
d4c229c1d8
|
Merge "ConnectivityService: detach the logic of global proxy." am: f386f9ec7e
Original change: undetermined
Change-Id: I2c14a5ab0d0d3b0d035969efefc882fde759b1a5
|
2021-05-31 05:07:44 +00:00 |
|
Jeff Sharkey
|
a920c97ce3
|
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom am: 7aaf57609e
Original change: undetermined
Change-Id: I78692bb0e519640609c7451b0d4730d052fcd2e8
|
2021-05-31 05:07:22 +00:00 |
|
Jeff Sharkey
|
28c658135d
|
Read iface stats from single proc file. am: d49f1a59f9
Original change: undetermined
Change-Id: Ic2f8bc737e4afa70121701f1958ac53bc1e1cc1a
|
2021-05-31 05:07:08 +00:00 |
|
Jeff Sharkey
|
4dafab30f5
|
Track xtables summary, move tether stats, time. am: ad268036a4
Original change: undetermined
Change-Id: I84e389b8cfc28d8fb854e6c43a1798f400aa0a09
|
2021-05-31 05:06:54 +00:00 |
|
Lorenzo Colitti
|
9f2a16a2b9
|
Revert "Tell the resolver what protocols to use." am: aa035385d3
Original change: undetermined
Change-Id: I16fade689a1c43ee42f3ecb919992edd247ac3f3
|
2021-05-31 05:06:40 +00:00 |
|
Jeff Sharkey
|
4d04edec38
|
Merge "Watch network subtype, tethering teardown, empty." am: 6d38bd1bc3
Original change: undetermined
Change-Id: I0a2a8f3f88fbee3aaff7c5919662888d39099dd7
|
2021-05-31 05:06:26 +00:00 |
|
Robert Greenwalt
|
92ecdf5bc1
|
am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom am: bc75548c32
Original change: undetermined
Change-Id: Ie2c8181014aa24ae87f32200fddf178431c64a50
|
2021-05-31 05:06:04 +00:00 |
|
Wink Saville
|
21c9cc9b91
|
am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom am: 693ee83a6c
Original change: undetermined
Change-Id: I050d5fead06f9dd4a99b2515dbee0088bf100ee7
|
2021-05-31 05:05:50 +00:00 |
|
Wink Saville
|
e71be33254
|
am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom am: 933cb47f64
Original change: undetermined
Change-Id: I24682210297c36c7591c958791c2ce948ede79fa
|
2021-05-31 05:05:37 +00:00 |
|
Irfan Sheriff
|
c919625221
|
Change hostname format to conform to specification am: 4aa0b2ece5
Original change: undetermined
Change-Id: I84907ce5c061c42c936771bf28d78fb6c25a243c
|
2021-05-31 05:05:24 +00:00 |
|
Jeff Sharkey
|
2cf1e5b9a7
|
Sample atomic network stats buckets, full poll. am: f444762587
Original change: undetermined
Change-Id: Ia4b9c77c54d348e40edf4d73d8212e4e9e0fb83b
|
2021-05-31 05:05:10 +00:00 |
|
Jeff Sharkey
|
0bff9d4eb8
|
[automerger skipped] am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom am: c611ea2aac -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I39a5dec15b0cf73afaae2992e03a64d2143781a6
|
2021-05-31 05:04:56 +00:00 |
|
Jeff Sharkey
|
2c005fdc42
|
am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom am: 8f5e775626
Original change: undetermined
Change-Id: I7ef18842feda52ac6a2d17dd7bf078ae07bd4ec0
|
2021-05-31 05:04:47 +00:00 |
|
JP Abgrall
|
5ace090016
|
NetworkManagement SocketTagger: Migrate QTagUid support to JNI. am: 7682298a7d
Original change: undetermined
Change-Id: Ibc2c88d363ac333f6c98a41d04756e9e1ac81ea7
|
2021-05-31 05:04:34 +00:00 |
|
Jeff Sharkey
|
65516ab379
|
Merge "Network stats flag to force complete poll." am: 9c57b7f2ef
Original change: undetermined
Change-Id: I7ce07d73ff7e48cc42c7a2afe3f8890ad5c6d081
|
2021-05-31 05:04:20 +00:00 |
|
The Android Open Source Project
|
fcf04fd93a
|
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release am: 3b30b92fac
Original change: undetermined
Change-Id: I4b78ea9d065c817c9f52bb5bcacc621bc6afd6d3
|
2021-05-31 05:03:58 +00:00 |
|
Robert Greenwalt
|
d4cb208d74
|
am ee4e84b3: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE am: a8d046103a
Original change: undetermined
Change-Id: I1c29a116d5930dcac4174ab4e13e308f073e153c
|
2021-05-31 05:03:43 +00:00 |
|
Jeff Sharkey
|
f16c01f296
|
Data usage structure optimizations. am: 4dc0642d32
Original change: undetermined
Change-Id: Id8fe62fe13ce3722157a2161738a0bf30ab2ed91
|
2021-05-31 05:03:29 +00:00 |
|
Jeff Sharkey
|
c1ae75a6ff
|
Poll UID stats during iface changes, enforce idx. am: d1a5951ed9
Original change: undetermined
Change-Id: I7b20f2cb1903212cee857de3785125d52f0e87a1
|
2021-05-31 05:03:14 +00:00 |
|
Jeff Sharkey
|
7e4dc9c55c
|
Merge "Selectively add stats based on iface active state." am: adbe75aaab
Original change: undetermined
Change-Id: Iebfe9e815489a26c06445e8b106af4de6888929b
|
2021-05-31 05:03:00 +00:00 |
|
Robert Greenwalt
|
5835895aa9
|
Create new isNetworkSupported API am: 0114f6e8e9
Original change: undetermined
Change-Id: I4515e99688ec38ecfa5663829a8f02e909ec9083
|
2021-05-31 05:02:37 +00:00 |
|
Jeff Sharkey
|
7a98f78ddd
|
Introduce immediate CONNECTIVITY_ACTION variant. am: 971cd16561
Original change: undetermined
Change-Id: I6c4c7143ba0911b553875d37fbd7f951d3e8118c
|
2021-05-31 05:02:23 +00:00 |
|
Jeff Sharkey
|
dc91cf9267
|
Always splice historical data stats, debug info. am: 0a7279c958
Original change: undetermined
Change-Id: Icf9a9439a035250189efcf8de8a170f97e00793e
|
2021-05-31 05:02:08 +00:00 |
|
Jeff Sharkey
|
41d82e9751
|
Data usage buckets active time, parsing ISE. am: 3dadd0f1f6
Original change: undetermined
Change-Id: Ib0663320ee6f66a3073eebaa6baa1812e9d3409c
|
2021-05-31 05:01:53 +00:00 |
|
Jeff Sharkey
|
c1995b8278
|
Register for kernel global data usage alerts. am: d3b657612d
Original change: undetermined
Change-Id: I147b5884f6b619fa91c688eed6518b5e782e3f58
|
2021-05-31 05:01:39 +00:00 |
|
Jeff Sharkey
|
8269780671
|
Proactively disable data when over policy limit. am: 805662d8fa
Original change: undetermined
Change-Id: I397ee7b5a915bb6b09eba5c05dab335887a3f411
|
2021-05-31 04:51:11 +00:00 |
|