The Android Open Source Project
|
a8365c8ffc
|
Reconcile with jb-release nakasi-factoryrom-release am: 29cdec9fd3
Original change: undetermined
Change-Id: I84db6ae8e38b5f9efe7dfb650b9afa78291db8fa
|
2021-05-31 12:32:15 +00:00 |
|
Robert Greenwalt
|
33d98f442c
|
am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev am: 6568a45c99
Original change: undetermined
Change-Id: I30325faa2cb52af2dd872e8f93f6d4c60a5d5ca2
|
2021-05-31 12:32:02 +00:00 |
|
The Android Open Source Project
|
568058b91f
|
Reconcile with jb-release am: ce77d5e629
Original change: undetermined
Change-Id: I3130109c038c21fb9b845479a2afd19e5fd801df
|
2021-05-31 12:31:50 +00:00 |
|
Jeff Sharkey
|
b3d60c3b4e
|
am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev am: dae5f0a509
Original change: undetermined
Change-Id: I8cf62de1342392ef040eee85a43c7d79c2b5fea2
|
2021-05-31 12:31:36 +00:00 |
|
The Android Automerger
|
76dacb1f0d
|
merge in jb-release history after reset to jb-dev am: 2da3efe1e8
Original change: undetermined
Change-Id: Ica0e0339bbb3d1136028a1eb86c13bf185089863
|
2021-05-31 12:31:24 +00:00 |
|
Jeff Sharkey
|
8a6a567e51
|
Fix network stats and policy tests. am: 0e5fa591b9
Original change: undetermined
Change-Id: If205d889c32b958194dd9a47fa3ecf0b8d1aa144
|
2021-05-31 12:31:11 +00:00 |
|
Jeff Sharkey
|
fb0656090d
|
Merge "Reduce persist threshold for lower warning/limit." into jb-dev am: 04536e49a0
Original change: undetermined
Change-Id: I7e6e29e902c083f77e592c0bdebd14490ef86dc2
|
2021-05-31 12:30:58 +00:00 |
|
Jeff Sharkey
|
e0564bc0e8
|
Merge "Begin collecting xtables iface counters." into jb-dev am: 1e329235a6
Original change: undetermined
Change-Id: Ib4dfb581f7219b399da5df085e0c3607138307b0
|
2021-05-31 12:30:36 +00:00 |
|
Jeff Sharkey
|
3c8120d790
|
Merge "Block metered APNs when app is restricted." into jb-dev am: 528c3f2139
Original change: undetermined
Change-Id: I405158bb791f345e94ca048483928cb92bc1eb63
|
2021-05-31 12:30:13 +00:00 |
|
Jeff Sharkey
|
fb9efec892
|
Support full 32 bits for socket tags. am: 528cf48b34
Original change: undetermined
Change-Id: I907aa06f6ce82358d86e9ba5c1a34d4beccc4f15
|
2021-05-31 12:29:49 +00:00 |
|
Robert Greenwalt
|
5150ae37a4
|
Add bit to eventlog to handle new network types am: 310fa08670
Original change: undetermined
Change-Id: I8f5bb4fc2220bf67507e5269e62b3e883e1ca8ba
|
2021-05-31 12:29:35 +00:00 |
|
Robert Greenwalt
|
7351acb2e7
|
Merge "Stop complaining about failure to remove routes" am: aabfae0bc8
Original change: undetermined
Change-Id: I86f4fc65f6c124b8c92c274c315b108d19c24e89
|
2021-05-31 12:29:22 +00:00 |
|
Jeff Sharkey
|
6bd6f2d6ae
|
Pipe DHCP vendor info towards framework. am: d6075598cb
Original change: undetermined
Change-Id: I01cfa3fbe8802829ffcc8cc470c98113be64fb82
|
2021-05-31 12:29:00 +00:00 |
|
Jeff Sharkey
|
d65274b267
|
Add ALLOW_METERED column to DownloadManager. am: 3022ee14a2
Original change: undetermined
Change-Id: I561980350699fd61398f4d3e884aff90f579a617
|
2021-05-31 12:28:46 +00:00 |
|
Jeff Sharkey
|
457fef110a
|
API to report if active network is metered. am: d00b130332
Original change: undetermined
Change-Id: If4686b1c1508999712d17e992b938b41099cd911
|
2021-05-31 12:28:33 +00:00 |
|
Jeff Sharkey
|
5ddf8cdd3a
|
Migrate to @Override to remove warnings. am: 078d356a9b
Original change: undetermined
Change-Id: Ia272c1c9bfe3f6eeea902babd630a73278375b98
|
2021-05-31 12:28:20 +00:00 |
|
Jeff Sharkey
|
7e808aad07
|
INetworkStatsSession with lifecycle for caching. am: dc164ff128
Original change: undetermined
Change-Id: Idb5fc45570bcccd1beda4af34812fe5af632281a
|
2021-05-31 12:28:07 +00:00 |
|
Jeff Sharkey
|
20c4bdb156
|
Support metered Wi-Fi NetworkPolicy. am: 2d9e5a5f9e
Original change: undetermined
Change-Id: Ie42f3a9978ff0e872014efbe0f9e4e6e0e76fd61
|
2021-05-31 12:27:54 +00:00 |
|
Mike Lockwood
|
78a0db64e7
|
Merge remote-tracking branch 'goog/ics-aah-exp' into merge am: 62b7c11709
Original change: undetermined
Change-Id: I7fd9a2dd16b178fc52e0eeabfd9ad790500cf267
|
2021-05-31 12:27:42 +00:00 |
|
yoonsung.nam
|
dc44fcd078
|
Fix the bug net.dns1.pid is same as net.dns2.pid am: 48d1833b15
Original change: undetermined
Change-Id: Iaf0ab0f221c677e44dbc64393351a20a22879711
|
2021-05-31 12:27:29 +00:00 |
|
Irfan Sheriff
|
373a9e426c
|
Improve Wi-Fi hand-off am: b9f329f633
Original change: undetermined
Change-Id: I856a3f9e0e79d15cb9d832b910de2439ff996741
|
2021-05-31 12:27:15 +00:00 |
|
The Android Open Source Project
|
2b211603d8
|
am 19222ad5: am 64406699: Reconcile with ics-mr1-release am: 5b04a4566f
Original change: undetermined
Change-Id: I141b59469949b63aae2fcf8278a6665901f5a043
|
2021-05-31 12:27:03 +00:00 |
|
The Android Open Source Project
|
71c3a732da
|
am d2a0a9d4: am b548bb97: Reconcile with ics-mr1-release am: 6afd0d0166
Original change: undetermined
Change-Id: I765021b2497fc6a9b3227ef95977c7afd0607c66
|
2021-05-31 12:26:48 +00:00 |
|
Robert Greenwalt
|
cd27296779
|
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: Ifee446f72fc68971021a5058577bddeb3f688d83
|
2021-05-31 12:16:23 +00:00 |
|
Robert Greenwalt
|
f8ef9fe485
|
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: I0ca2dbc541ad9963015bf3ee235a1080a702ea42
|
2021-05-31 12:16:08 +00:00 |
|
Doug Zongker
|
7e176e3c7a
|
store the hw addr in the extraInfo field of ethernet NetworkInfos am: b1a238dbb3
Original change: undetermined
Change-Id: I823f42e0b7ab59c511e27e2d5a51bbb1a90047fc
|
2021-05-31 12:15:53 +00:00 |
|
Jeff Sharkey
|
70acf41286
|
Send broadcast when changing restrict background. am: b1b6ccd157
Original change: undetermined
Change-Id: I811cfe65d6e58a9f411ae09223a69c00952933df
|
2021-05-31 12:15:38 +00:00 |
|
Jeff Sharkey
|
f1213b6053
|
Unify shorthand for byte-based units. am: b3a842ef9c
Original change: undetermined
Change-Id: I687161e0ff719e708a4c72842fbe8620cf15193b
|
2021-05-31 12:15:22 +00:00 |
|
Jeff Sharkey
|
3d71601fab
|
Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED. am: c958c77f1a
Original change: undetermined
Change-Id: I02b5a22b39f7009e3510d2c963491fdad91a5b55
|
2021-05-31 12:15:09 +00:00 |
|
Wink Saville
|
8e8f0ab8aa
|
Merge "Add additional debug" am: 678258626a
Original change: undetermined
Change-Id: I1c12d52dacf2282ff07edbf90cc0333f752008e2
|
2021-05-31 12:14:57 +00:00 |
|
Jeff Sharkey
|
7d9044c250
|
Move network stats to FileRotator pattern. am: 6298b780ae
Original change: undetermined
Change-Id: I420a5e29e1f413551613ea12735bdd83fa11c834
|
2021-05-31 12:14:35 +00:00 |
|
Jean-Baptiste Queru
|
b119a0451a
|
am a1e87397: (-s ours) am f40f28e2: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" am: 98b4bdbd7d
Original change: undetermined
Change-Id: Icc5bc66a7730be67b5c7cec5f2eac81b694f6c83
|
2021-05-31 12:14:23 +00:00 |
|
The Android Open Source Project
|
a53eef37d9
|
am c1cf0488: Reconcile with ics-mr1-release am: 33789dd08c
Original change: undetermined
Change-Id: I58c30e9f8b8eb85fe65d574c8f8ca3f08e681e29
|
2021-05-31 12:14:11 +00:00 |
|
Robert Greenwalt
|
ecf4fa7d00
|
Merge "Stop using shared DUN APN when tethering stops." am: 83b1fc9643
Original change: undetermined
Change-Id: Ieb3b9e6d5215c39490a613ac73fd561c41d859b1
|
2021-05-31 12:13:58 +00:00 |
|
Robert Greenwalt
|
5fb2916d49
|
am 21eba066: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 am: 6ed1f684fd
Original change: undetermined
Change-Id: Ide16c9d70e9a58d601d27f7354cc548f8be653de
|
2021-05-31 12:13:36 +00:00 |
|
Steve Block
|
8204650c2a
|
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE am: 1be767cf74
Original change: undetermined
Change-Id: I6ce139954c9c4c0131755ca388fa357dd0f9e487
|
2021-05-31 12:13:24 +00:00 |
|
Jeff Sharkey
|
0421a1c8a4
|
Restrict app data on metered networks. am: bcd1e340c6
Original change: undetermined
Change-Id: I7a24dcac2bd50bc47dc21c21d9e221f33b2bb7eb
|
2021-05-31 12:13:11 +00:00 |
|
The Android Open Source Project
|
493018b38c
|
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release am: 691bc744b0
Original change: undetermined
Change-Id: I0e62b35fcb72afd2ebbdf9da70d94112e49bda3a
|
2021-05-31 12:12:59 +00:00 |
|
Robert Greenwalt
|
b64b6f45f7
|
am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 am: 60660ab0f4
Original change: undetermined
Change-Id: Iadcc73469b85252e0b088135256bf4a508e27a00
|
2021-05-31 12:12:46 +00:00 |
|
Robert Greenwalt
|
9df7a08dad
|
am e55e5b84: am 3dba4353: Fix the build. am: 177cac90d0
Original change: undetermined
Change-Id: I09d535bbf44e08bcd3a861f239d6a470b3bd7a1a
|
2021-05-31 12:12:32 +00:00 |
|
Robert Greenwalt
|
5b9555c6f7
|
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 am: 0b3d2a85b1
Original change: undetermined
Change-Id: Ic345b39b30439b206affa56432f92243e1b99da3
|
2021-05-31 12:12:19 +00:00 |
|
The Android Open Source Project
|
1af2ae0ad6
|
Reconcile with ics-mr0-release ics-mr1-release am: 20ca0d4cf0
Original change: undetermined
Change-Id: I8baed84adecdec687d65d8de9a55ada9e7496b1c
|
2021-05-31 12:12:08 +00:00 |
|
Jeff Sharkey
|
bea7833f50
|
am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 am: ac0fb9c578
Original change: undetermined
Change-Id: I8e7a0d3054e4051e4a6158f9cf4075dd74090138
|
2021-05-31 12:11:54 +00:00 |
|
Robert Greenwalt
|
8016e0fd02
|
am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService. am: 28e752f026
Original change: undetermined
Change-Id: Ifed4a924b7a582bc4b34e177f99a80b5ffd14719
|
2021-05-31 12:11:41 +00:00 |
|
Scott Main
|
e8c768780d
|
Merge "docs: some helpful javadocs for network info" am: 27ea83f6f2
Original change: undetermined
Change-Id: Idec6e40399209b4672b870fe0d70a56e251b59f8
|
2021-05-31 12:11:28 +00:00 |
|
Akwasi Boateng
|
fbb5785f55
|
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: Idd723c47f2faf482d346a07067ac36a17596c585
|
2021-05-31 12:11:07 +00:00 |
|
The Android Open Source Project
|
f540614bbb
|
Reconcile with ics-mr1-release am: ad8c5483de
Original change: undetermined
Change-Id: Ia8461fca6984558cec52a9cc1ffa2c9e818a304a
|
2021-05-31 12:10:55 +00:00 |
|
Jeff Sharkey
|
98b19508dc
|
am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 am: dbb59f22db
Original change: undetermined
Change-Id: Ibe67ef9db5e3960da17e1bcf7a45783e2309c510
|
2021-05-31 12:10:42 +00:00 |
|
Robert Greenwalt
|
3f16703e6a
|
am 604019c8: Merge "Fix build." into ics-mr1 am: 2511c7a555
Original change: undetermined
Change-Id: Id6e1101b177c8cbef9635c16da9241bc89ba4390
|
2021-05-31 12:10:29 +00:00 |
|
Robert Greenwalt
|
fdf5058e65
|
resolved conflicts for merge of ea54b760 to master am: 423307deb6
Original change: undetermined
Change-Id: If54a2800eabbcc6299eca50a89a65bcc1c50667d
|
2021-05-31 12:10:16 +00:00 |
|