Jeff Sharkey
|
2bb2a941a0
|
resolved conflicts for merge of ab4e251a to master am: 696aeb4e78
Original change: undetermined
Change-Id: Ib16beb701f8e1947e6da836b47798e4daebfa639
|
2021-05-31 05:34:12 +00:00 |
|
Ashish Sharma
|
971b2b01bd
|
Merge "Setup idletimer for network interface." am: 5f4cd1dfef
Original change: undetermined
Change-Id: If174f83dac03da8eb5860d232de92ece288f9a50
|
2021-05-31 05:33:59 +00:00 |
|
Jeff Sharkey
|
57026e4f63
|
Merge "Include network type that caused broadcast." into jb-mr1-dev am: 976942a8ee
Original change: undetermined
Change-Id: I200833519100685474c282353239b5818374dbec
|
2021-05-31 05:33:37 +00:00 |
|
Jeff Sharkey
|
e8f9a7a4cb
|
Make generic BaseNetworkObserver. am: 60e6c1ac06
Original change: undetermined
Change-Id: I3e709d5f4cc14436c6bf1d6c3cc020802449a95d
|
2021-05-31 05:33:15 +00:00 |
|
Jeff Sharkey
|
187d6e32f1
|
Split NST handler events away from CS internals. am: a1ef1bec2a
Original change: undetermined
Change-Id: Iddbf3468edff7207fc3cf9573793b350a3e9144f
|
2021-05-31 05:33:01 +00:00 |
|
Haoyu Bai
|
17319ab7c7
|
Network data activity change intent for network interfaces. am: b5da575fc7
Original change: undetermined
Change-Id: I2d89198295e658bf70053dfd8dbee53234273f96
|
2021-05-31 05:32:48 +00:00 |
|
Wink Saville
|
f5374c6d26
|
[automerger skipped] am 406feb59: (-s ours) Create telephony-common and mms-common - DO NOT MERGE am: e0bdc06669 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ib65c8f591e0efec485a6e9fc74006b346f819467
|
2021-05-31 05:32:35 +00:00 |
|
Wink Saville
|
80d49c69b7
|
Create telephony-common and mms-common am: 64e3f78abb
Original change: undetermined
Change-Id: Iddc420f86a4bbcbdbfbb514434c90e0ebc6009be
|
2021-05-31 05:32:26 +00:00 |
|
The Android Open Source Project
|
2c8cf43129
|
Reconcile with jb-release am: da0ba6beec
Original change: undetermined
Change-Id: I262a4674ff8bac06bc8880f7937d771a25d67d0d
|
2021-05-31 05:32:13 +00:00 |
|
Nicolas Falliere
|
dd41b308bd
|
am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev am: 5889983f0b
Original change: undetermined
Change-Id: Ib57570da47d7054773df637a8e1895ec9d10f51d
|
2021-05-31 05:32:00 +00:00 |
|
The Android Open Source Project
|
d07a1fc9ce
|
Reconcile with jb-release nakasi-factoryrom-release am: 29cdec9fd3
Original change: undetermined
Change-Id: Icc0aca969fc422236db6e0ce267067ff11221d4e
|
2021-05-31 05:31:47 +00:00 |
|
Robert Greenwalt
|
2fb9148a39
|
am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev am: 6568a45c99
Original change: undetermined
Change-Id: I916247bd3f65e5db347e25518655f9b6288987a1
|
2021-05-31 05:31:33 +00:00 |
|
The Android Open Source Project
|
a68eaa35bf
|
Reconcile with jb-release am: ce77d5e629
Original change: undetermined
Change-Id: Ibd184aeb4ee22dcfa7ba36cd849aab302c5afcd3
|
2021-05-31 05:31:20 +00:00 |
|
Jeff Sharkey
|
924fad15ea
|
am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev am: dae5f0a509
Original change: undetermined
Change-Id: I21bdf93688abb2045e4152f92a2759ba9b8c7555
|
2021-05-31 05:31:04 +00:00 |
|
The Android Automerger
|
64ab8900ea
|
merge in jb-release history after reset to jb-dev am: 2da3efe1e8
Original change: undetermined
Change-Id: I7de1bb9e2b833c5405e1393b58499509a33f276e
|
2021-05-31 05:30:51 +00:00 |
|
Jeff Sharkey
|
6423b9f61e
|
Fix network stats and policy tests. am: 0e5fa591b9
Original change: undetermined
Change-Id: Ib3489dc70af3d75c4a4c87658ff6d9a2738b3292
|
2021-05-31 05:30:36 +00:00 |
|
Jeff Sharkey
|
594eb0934b
|
Merge "Reduce persist threshold for lower warning/limit." into jb-dev am: 04536e49a0
Original change: undetermined
Change-Id: I0de0aa0a5848b8dfd50e666581c4390c72abfd02
|
2021-05-31 05:30:21 +00:00 |
|
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 |
|