Jeff Sharkey
|
d4dbd985b8
|
Merge "Begin collecting xtables iface counters." into jb-dev am: 1e329235a6
Original change: undetermined
Change-Id: Ibda8099e60ccf095f14ac433896c344d4ad874b5
|
2021-05-31 05:29:58 +00:00 |
|
Jeff Sharkey
|
58266a0a0e
|
Merge "Block metered APNs when app is restricted." into jb-dev am: 528c3f2139
Original change: undetermined
Change-Id: Ia6aabd4e64b21cdc9a4890784386ea6fdd9b45da
|
2021-05-31 05:29:36 +00:00 |
|
Jeff Sharkey
|
b2649bbe67
|
Support full 32 bits for socket tags. am: 528cf48b34
Original change: undetermined
Change-Id: I0f3805aead4ccbe44738f66d34c8d0be7f3f6b97
|
2021-05-31 05:29:14 +00:00 |
|
Robert Greenwalt
|
9e398e81cd
|
Add bit to eventlog to handle new network types am: 310fa08670
Original change: undetermined
Change-Id: Ia12eecd72d1fbb60bfab20f786004b81dfd04275
|
2021-05-31 05:29:00 +00:00 |
|
Robert Greenwalt
|
1c7380e18d
|
Merge "Stop complaining about failure to remove routes" am: aabfae0bc8
Original change: undetermined
Change-Id: I0d62c7b3f50ae1ae7cae2ce088dd84fb239816af
|
2021-05-31 05:28:46 +00:00 |
|
Jeff Sharkey
|
f09e632335
|
Pipe DHCP vendor info towards framework. am: d6075598cb
Original change: undetermined
Change-Id: I036af97e82b8ffc62bd745733ece4974093e6e6e
|
2021-05-31 05:28:23 +00:00 |
|
Jeff Sharkey
|
2df836fbaf
|
Add ALLOW_METERED column to DownloadManager. am: 3022ee14a2
Original change: undetermined
Change-Id: I25194636afbf4ebf2a506eb34267da2146ccaa84
|
2021-05-31 05:28:10 +00:00 |
|
Jeff Sharkey
|
10485cf869
|
API to report if active network is metered. am: d00b130332
Original change: undetermined
Change-Id: Iec8831e29ecdae115d1468380467e01802f75eb6
|
2021-05-31 05:27:56 +00:00 |
|
Jeff Sharkey
|
99732343de
|
Migrate to @Override to remove warnings. am: 078d356a9b
Original change: undetermined
Change-Id: Iaba016fbd8e2803aae910cec366d14b71d05da61
|
2021-05-31 05:27:42 +00:00 |
|
Jeff Sharkey
|
d88b7eb7e6
|
INetworkStatsSession with lifecycle for caching. am: dc164ff128
Original change: undetermined
Change-Id: I79e329f0d7d1bb365e99b8a3b7ef2470829caf5e
|
2021-05-31 05:27:28 +00:00 |
|
Jeff Sharkey
|
2d6480dd66
|
Support metered Wi-Fi NetworkPolicy. am: 2d9e5a5f9e
Original change: undetermined
Change-Id: Ib8038840a80ab8b21b1f425afc6427169745ae7e
|
2021-05-31 05:27:14 +00:00 |
|
Mike Lockwood
|
e80bf0bf90
|
Merge remote-tracking branch 'goog/ics-aah-exp' into merge am: 62b7c11709
Original change: undetermined
Change-Id: I29e03a850d6cea33430e93d2b8ecdd21ceb5a801
|
2021-05-31 05:27:01 +00:00 |
|
yoonsung.nam
|
ef31e0ec89
|
Fix the bug net.dns1.pid is same as net.dns2.pid am: 48d1833b15
Original change: undetermined
Change-Id: Ifba6bd111389b03e67b9b638804ee875fcafd3c0
|
2021-05-31 05:26:47 +00:00 |
|
Irfan Sheriff
|
80a9c0bbec
|
Improve Wi-Fi hand-off am: b9f329f633
Original change: undetermined
Change-Id: I718d815a282684a97427802c2ca1f5632fb5481a
|
2021-05-31 05:26:34 +00:00 |
|
The Android Open Source Project
|
3f4abc37c3
|
am 19222ad5: am 64406699: Reconcile with ics-mr1-release am: 5b04a4566f
Original change: undetermined
Change-Id: I0cc2fed072093498ac6d8e3d76b8bcde95b008bb
|
2021-05-31 05:26:20 +00:00 |
|
The Android Open Source Project
|
fda2fb4e1c
|
am d2a0a9d4: am b548bb97: Reconcile with ics-mr1-release am: 6afd0d0166
Original change: undetermined
Change-Id: I1dc6765d04ae1c9c78cdbfb65325d6ff3e7e3438
|
2021-05-31 05:26:06 +00:00 |
|
Robert Greenwalt
|
2a123d2eff
|
am 4f967940: am ccdf4844: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 am: 0e1bb7585e
Original change: undetermined
Change-Id: I193267c4227bbcd1ff99e10c53fa884d1ca1eb33
|
2021-05-31 05:25:52 +00:00 |
|
Robert Greenwalt
|
ec626513e6
|
am 1b2583c4: am 6df6d66f: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 am: 5a9b24658b
Original change: undetermined
Change-Id: Ie73aacbe12b0720d6d79312126e59881668f13fe
|
2021-05-31 05:25:33 +00:00 |
|
Doug Zongker
|
97c9b10241
|
store the hw addr in the extraInfo field of ethernet NetworkInfos am: b1a238dbb3
Original change: undetermined
Change-Id: I4fc5d3cc752ce7b7b88ef313f26c1e9af47c1a63
|
2021-05-31 05:25:20 +00:00 |
|
Jeff Sharkey
|
e901f88627
|
Send broadcast when changing restrict background. am: b1b6ccd157
Original change: undetermined
Change-Id: Ic26de34723401489ced509786db178071fb4e16e
|
2021-05-31 05:25:06 +00:00 |
|
Jeff Sharkey
|
d1b9e02bc9
|
Unify shorthand for byte-based units. am: b3a842ef9c
Original change: undetermined
Change-Id: Ic9124ec7ec56f56bbd9263c2541c30a35470861f
|
2021-05-31 05:24:51 +00:00 |
|
Jeff Sharkey
|
db4ca2cb46
|
Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED. am: c958c77f1a
Original change: undetermined
Change-Id: Ic3944170c85029ce52fd7c6b85a0bb8fd9203438
|
2021-05-31 05:24:38 +00:00 |
|
Wink Saville
|
54c2fe9e8a
|
Merge "Add additional debug" am: 678258626a
Original change: undetermined
Change-Id: Iff980032abe6e7a55e981f4a904c11ae430c5e11
|
2021-05-31 05:24:24 +00:00 |
|
Jeff Sharkey
|
6b019ee675
|
Move network stats to FileRotator pattern. am: 6298b780ae
Original change: undetermined
Change-Id: I150cf3d53b73e8e1e22f83fe4334d9ffa6d09af0
|
2021-05-31 05:23:57 +00:00 |
|
Jean-Baptiste Queru
|
592f966bd5
|
am a1e87397: (-s ours) am f40f28e2: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" am: 98b4bdbd7d
Original change: undetermined
Change-Id: I77933cdd170cb89efa5f7dbe79cd6fa5a3897a6a
|
2021-05-31 05:23:36 +00:00 |
|
The Android Open Source Project
|
374c16d3f0
|
am c1cf0488: Reconcile with ics-mr1-release am: 33789dd08c
Original change: undetermined
Change-Id: Icdf076abe0b4c6204636ef52e22bb671b4f1c6ff
|
2021-05-31 05:13:50 +00:00 |
|
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 |
|