Jeff Sharkey
|
43ccc5e16c
|
Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED. am: c958c77f1a am: 3d71601fab am: b5d620de0a
Original change: undetermined
Change-Id: I5a779ee165605c7c537b815c089db4381d654baa
|
2021-05-31 12:52:44 +00:00 |
|
Wink Saville
|
5026d7659e
|
Merge "Add additional debug" am: 678258626a am: 8e8f0ab8aa am: 8e91c03392
Original change: undetermined
Change-Id: Ic01cd3a1c66b20ea9faed069fd88a8fd3c2fc2c6
|
2021-05-31 12:52:31 +00:00 |
|
Jeff Sharkey
|
a6bd05864b
|
Move network stats to FileRotator pattern. am: 6298b780ae am: 7d9044c250 am: f75fdae24a
Original change: undetermined
Change-Id: If3878494249df3a6808dd29e6736f825c9b44d83
|
2021-05-31 12:52:17 +00:00 |
|
Jean-Baptiste Queru
|
6eeae09060
|
am a1e87397: (-s ours) am f40f28e2: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" am: 98b4bdbd7d am: b119a0451a am: f4fe613d72
Original change: undetermined
Change-Id: Iac1ed88a367541ca11542e68d253ca241289fb4d
|
2021-05-31 12:52:04 +00:00 |
|
Jeff Sharkey
|
b5d620de0a
|
Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED. am: c958c77f1a am: 3d71601fab
Original change: undetermined
Change-Id: I7426abda9f0f00e4db3672d0a38b380160bc0914
|
2021-05-31 12:51:58 +00:00 |
|
The Android Open Source Project
|
d4f1078c81
|
am c1cf0488: Reconcile with ics-mr1-release am: 33789dd08c am: a53eef37d9 am: ae06aa493d
Original change: undetermined
Change-Id: If264242d099edd470602ece57b39cd5949bf2ea1
|
2021-05-31 12:51:51 +00:00 |
|
Wink Saville
|
8e91c03392
|
Merge "Add additional debug" am: 678258626a am: 8e8f0ab8aa
Original change: undetermined
Change-Id: Ie1e3237c1e3e49bba514c17bd5bd49df6cdbef0f
|
2021-05-31 12:51:45 +00:00 |
|
Robert Greenwalt
|
42b71f1006
|
Merge "Stop using shared DUN APN when tethering stops." am: 83b1fc9643 am: ecf4fa7d00 am: 6abdef8660
Original change: undetermined
Change-Id: I421dfd86e206e7953ecd4bbc775e97d7d1234b57
|
2021-05-31 12:51:37 +00:00 |
|
Jeff Sharkey
|
f75fdae24a
|
Move network stats to FileRotator pattern. am: 6298b780ae am: 7d9044c250
Original change: undetermined
Change-Id: Icda74b37772a1f324f0afd88f86897f4597930d6
|
2021-05-31 12:51:30 +00:00 |
|
Robert Greenwalt
|
8eb18d152a
|
am 21eba066: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 am: 6ed1f684fd am: 5fb2916d49 am: 6647f13adc
Original change: undetermined
Change-Id: Ib80f63266dc4d9251b7b756d1e105d996c2c2b0c
|
2021-05-31 12:51:23 +00:00 |
|
Jean-Baptiste Queru
|
f4fe613d72
|
am a1e87397: (-s ours) am f40f28e2: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" am: 98b4bdbd7d am: b119a0451a
Original change: undetermined
Change-Id: Icd4579df17bdc73e150fa6c972ab016e303761b8
|
2021-05-31 12:51:16 +00:00 |
|
Steve Block
|
bd1cf2e6d3
|
[automerger skipped] Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE am: 1be767cf74 am: 8204650c2a am: 66c8c3311b -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ieab8d95e18ff009a93f5a998f6f19be182da5f34
|
2021-05-31 12:51:08 +00:00 |
|
The Android Open Source Project
|
ae06aa493d
|
am c1cf0488: Reconcile with ics-mr1-release am: 33789dd08c am: a53eef37d9
Original change: undetermined
Change-Id: Id5395534d4c600bcdec228bebb3300af0422a6f5
|
2021-05-31 12:51:03 +00:00 |
|
Jeff Sharkey
|
0ac58a8ab8
|
Restrict app data on metered networks. am: bcd1e340c6 am: 0421a1c8a4 am: aee48e7810
Original change: undetermined
Change-Id: I1edc4d01771d6404dd219304f1cd026e0addad40
|
2021-05-31 12:51:00 +00:00 |
|
Robert Greenwalt
|
6abdef8660
|
Merge "Stop using shared DUN APN when tethering stops." am: 83b1fc9643 am: ecf4fa7d00
Original change: undetermined
Change-Id: I0437ffaa068a617b70292bd51ea6da08e3c9ece4
|
2021-05-31 12:50:48 +00:00 |
|
The Android Open Source Project
|
7fbcc29f49
|
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release am: 691bc744b0 am: 493018b38c am: 1c069356e0
Original change: undetermined
Change-Id: I4bd7b181837313c0cff2ff551e9e8e8e91b4d629
|
2021-05-31 12:50:46 +00:00 |
|
Robert Greenwalt
|
6647f13adc
|
am 21eba066: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 am: 6ed1f684fd am: 5fb2916d49
Original change: undetermined
Change-Id: I5e2e6edd60fcd614334936d4f7bc04e954b07a98
|
2021-05-31 12:50:34 +00:00 |
|
Robert Greenwalt
|
e4da51daf2
|
am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 am: 60660ab0f4 am: b64b6f45f7 am: 421ec12497
Original change: undetermined
Change-Id: Id9629521b404ea83a2486ec1a66ff193c1650627
|
2021-05-31 12:50:33 +00:00 |
|
Steve Block
|
66c8c3311b
|
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE am: 1be767cf74 am: 8204650c2a
Original change: undetermined
Change-Id: I1ed524c0e14df7ce59462a60749b38dc16ef999c
|
2021-05-31 12:50:21 +00:00 |
|
Robert Greenwalt
|
4538aa116e
|
am e55e5b84: am 3dba4353: Fix the build. am: 177cac90d0 am: 9df7a08dad am: 1d655bab1f
Original change: undetermined
Change-Id: I96f351e42c4ecd9e811cf285b4ad316c50217fe4
|
2021-05-31 12:50:19 +00:00 |
|
Jeff Sharkey
|
aee48e7810
|
Restrict app data on metered networks. am: bcd1e340c6 am: 0421a1c8a4
Original change: undetermined
Change-Id: I765b306e44a47d119416525f0865f0fe888d2eb5
|
2021-05-31 12:50:08 +00:00 |
|
Robert Greenwalt
|
8fb1e764da
|
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 am: 0b3d2a85b1 am: 5b9555c6f7 am: e7040c38b5
Original change: undetermined
Change-Id: Ia97c60e5c0a997d5376a2f6785819ca397f6cc30
|
2021-05-31 12:50:06 +00:00 |
|
The Android Open Source Project
|
1c069356e0
|
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release am: 691bc744b0 am: 493018b38c
Original change: undetermined
Change-Id: I2c71e0e527f62888ec0cee783c33860c317818c4
|
2021-05-31 12:49:55 +00:00 |
|
The Android Open Source Project
|
31f19aff6d
|
Reconcile with ics-mr0-release ics-mr1-release am: 20ca0d4cf0 am: 1af2ae0ad6 am: 693c5d37f4
Original change: undetermined
Change-Id: Ifb248ec8787deb1dedc295c42d3f5caabb32a0a1
|
2021-05-31 12:49:55 +00:00 |
|
Robert Greenwalt
|
421ec12497
|
am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 am: 60660ab0f4 am: b64b6f45f7
Original change: undetermined
Change-Id: I50686dcf5f2c727500863610a60f294246bab181
|
2021-05-31 12:49:40 +00:00 |
|
Jeff Sharkey
|
d797e5787a
|
am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 am: ac0fb9c578 am: bea7833f50 am: 7fe1c69051
Original change: undetermined
Change-Id: Idee527745332079d8507f1bae07223b4f7fc2b96
|
2021-05-31 12:49:38 +00:00 |
|
Robert Greenwalt
|
1d655bab1f
|
am e55e5b84: am 3dba4353: Fix the build. am: 177cac90d0 am: 9df7a08dad
Original change: undetermined
Change-Id: If923084e34d4ccc2c4c397afd1b431fbd9b046e4
|
2021-05-31 12:49:26 +00:00 |
|
Robert Greenwalt
|
e7040c38b5
|
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 am: 0b3d2a85b1 am: 5b9555c6f7
Original change: undetermined
Change-Id: I8887b3e629da983d110460e99a44d74ec463a358
|
2021-05-31 12:49:12 +00:00 |
|
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
|
be2fac631f
|
am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService. am: 28e752f026 am: 8016e0fd02 am: 75a6d7a443
Original change: undetermined
Change-Id: I97132e24424cad32bdb0c6ffe4b673127a29224d
|
2021-05-31 12:48:35 +00:00 |
|
Scott Main
|
62e0196fce
|
Merge "docs: some helpful javadocs for network info" am: 27ea83f6f2 am: e8c768780d am: cbb65b08fe
Original change: undetermined
Change-Id: I6c9e8917dda543cf49fe07b47df4de63279cb067
|
2021-05-31 12:48:22 +00:00 |
|
Akwasi Boateng
|
aac1aa9e6b
|
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 am: dc9b76ecb1
Original change: undetermined
Change-Id: Ibad71c3c1160ace3cbcbf430548ea4566af378ca
|
2021-05-31 12:48:10 +00:00 |
|
The Android Open Source Project
|
ed81c794d4
|
Reconcile with ics-mr1-release am: ad8c5483de am: f540614bbb am: 82f271b611
Original change: undetermined
Change-Id: I0d9d39203e12c5681c8c7a5539f1449dfe53ffec
|
2021-05-31 12:47:59 +00:00 |
|
Jeff Sharkey
|
ec33e0e205
|
am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 am: dbb59f22db am: 98b19508dc am: 4c7f7cb6fd
Original change: undetermined
Change-Id: I536745cc3222500b36049d206cbc84f72c88bf30
|
2021-05-31 12:47:46 +00:00 |
|
Robert Greenwalt
|
ae45027ad6
|
am 604019c8: Merge "Fix build." into ics-mr1 am: 2511c7a555 am: 3f16703e6a am: 2a661c88e6
Original change: undetermined
Change-Id: I1cd0b6635d314182513e9b6098b6ad332b47c6a0
|
2021-05-31 12:47:33 +00:00 |
|
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 |
|