Jeff Sharkey
|
b9d09316da
|
Support metered Wi-Fi NetworkPolicy. am: 2d9e5a5f9e am: 20c4bdb156
Original change: undetermined
Change-Id: Ia7030a8852ca739e19c204092e9ded82796abd9f
|
2021-05-31 12:54:28 +00:00 |
|
Mike Lockwood
|
8d4c9a210e
|
Merge remote-tracking branch 'goog/ics-aah-exp' into merge am: 62b7c11709 am: 78a0db64e7
Original change: undetermined
Change-Id: I1ffa1d6f6d312711f57e76055b75218f729fc62e
|
2021-05-31 12:54:15 +00:00 |
|
yoonsung.nam
|
dd960facae
|
Fix the bug net.dns1.pid is same as net.dns2.pid am: 48d1833b15 am: dc44fcd078
Original change: undetermined
Change-Id: Iafe39855bb9737486676ae6055985dda4869fc24
|
2021-05-31 12:54:02 +00:00 |
|
Irfan Sheriff
|
72c3b02aa6
|
Improve Wi-Fi hand-off am: b9f329f633 am: 373a9e426c
Original change: undetermined
Change-Id: I4d985bc1ef94b8b4ccf685068fe879b2add0a471
|
2021-05-31 12:53:48 +00:00 |
|
The Android Open Source Project
|
818d795c0a
|
am 19222ad5: am 64406699: Reconcile with ics-mr1-release am: 5b04a4566f am: 2b211603d8
Original change: undetermined
Change-Id: I776cd5d48869c77edde3b6d2c0697f8601fef1f6
|
2021-05-31 12:53:35 +00:00 |
|
The Android Open Source Project
|
e6df80acf2
|
am d2a0a9d4: am b548bb97: Reconcile with ics-mr1-release am: 6afd0d0166 am: 71c3a732da
Original change: undetermined
Change-Id: I45b4229b69bfab02ac4e023ce9b7d5f32e08be1b
|
2021-05-31 12:53:22 +00:00 |
|
Robert Greenwalt
|
720f6a1576
|
am 4f967940: am ccdf4844: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 am: 0e1bb7585e am: cd27296779
Original change: undetermined
Change-Id: I0676bb99d529679514f567fbbdac594047f53998
|
2021-05-31 12:53:07 +00:00 |
|
Robert Greenwalt
|
c8229be195
|
am 1b2583c4: am 6df6d66f: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 am: 5a9b24658b am: f8ef9fe485
Original change: undetermined
Change-Id: I2621ce0a778178b12c6def493186b5bc4e136f43
|
2021-05-31 12:52:54 +00:00 |
|
Doug Zongker
|
e77e470c91
|
store the hw addr in the extraInfo field of ethernet NetworkInfos am: b1a238dbb3 am: 7e176e3c7a
Original change: undetermined
Change-Id: Ifb3767caa434d377b80f0aa20612b579209bac30
|
2021-05-31 12:52:41 +00:00 |
|
Jeff Sharkey
|
2a5bc95651
|
Send broadcast when changing restrict background. am: b1b6ccd157 am: 70acf41286
Original change: undetermined
Change-Id: I1ef49245d1a7a64a3f154d581ac8e252b990cf5d
|
2021-05-31 12:52:27 +00:00 |
|
Jeff Sharkey
|
f0f426a906
|
Unify shorthand for byte-based units. am: b3a842ef9c am: f1213b6053
Original change: undetermined
Change-Id: I29abd434bfaaff5fa2d63e7d4ba5856f2394dfa7
|
2021-05-31 12:52:11 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|