Commit Graph

11495 Commits

Author SHA1 Message Date
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
The Android Automerger
6ea673fc0b merge in ics-mr1-release history after reset to ics-mr1 am: 0f7eb3a300
Original change: undetermined

Change-Id: Idc096c945f975a3dfc0fcc0da5af8c33db8340da
2021-05-31 12:10:04 +00:00
Robert Greenwalt
78dd8d7e27 am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 am: 9dcad72873
Original change: undetermined

Change-Id: Ie1d1ad1f50a171d7e163749a6881578a07c89a02
2021-05-31 12:09:51 +00:00
Jeff Sharkey
38c676d7ce Correct proc file reader, optimizations. am: e370a59bec
Original change: undetermined

Change-Id: I22ac22e2c3b850f8ae629d18ef4029b6ce2f637b
2021-05-31 12:09:38 +00:00
Robert Greenwalt
22bd5b387a Temp disable Tethering if DUN is required am: 274518a279
Original change: undetermined

Change-Id: Ic710d2750aa377e0090404e221b6249f6c5381fb
2021-05-31 12:09:24 +00:00
Jeff Sharkey
12789340a4 Move battery stats to xt_qtaguid for data stats. am: aac2c50385
Original change: undetermined

Change-Id: I7d653bd634453787d058d6b321e79f34b2427185
2021-05-31 12:09:11 +00:00
Scott Main
d7e0c60287 docs: deprecate thingy am: 5058914700
Original change: undetermined

Change-Id: I298efaa0ed4dfcc4881a49ea0f0598618aea1ff8
2021-05-31 12:08:58 +00:00
Chia-chi Yeh
19d17dde29 Merge "VPN: temporarily disable the default proxy when VPN is active." am: ec49c91929
Original change: undetermined

Change-Id: I0d93262989047aba0d3235e3a7f4262d9c2d94e6
2021-05-31 12:08:45 +00:00
Chia-chi Yeh
2bd9374bda Merge "ConnectivityService: detach the logic of global proxy." am: f386f9ec7e
Original change: undetermined

Change-Id: I4dec6ab3db4537cb7d3c6c8a74ad8a62198b3b2a
2021-05-31 12:08:24 +00:00
Jeff Sharkey
8459995b62 am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom am: 7aaf57609e
Original change: undetermined

Change-Id: If991a0fe79cdc36d0610b98e00ecfb3feba21975
2021-05-31 12:08:02 +00:00
Jeff Sharkey
69fbe294fc Read iface stats from single proc file. am: d49f1a59f9
Original change: undetermined

Change-Id: I9dd05d93be8710a04528b83044e692e150a3e2ac
2021-05-31 12:07:50 +00:00
Jeff Sharkey
a7cb93ff17 Track xtables summary, move tether stats, time. am: ad268036a4
Original change: undetermined

Change-Id: Icb2bdace97ebcf2e2182481a2f7dbb52ee58c5d1
2021-05-31 12:07:35 +00:00
Lorenzo Colitti
e230672be4 Revert "Tell the resolver what protocols to use." am: aa035385d3
Original change: undetermined

Change-Id: I8fec2252bcd49fc669ba86e505b26833c0f77134
2021-05-31 12:07:22 +00:00
Jeff Sharkey
e1ddb1a6ad Merge "Watch network subtype, tethering teardown, empty." am: 6d38bd1bc3
Original change: undetermined

Change-Id: I40f098b117dc0b9761446cf887bc6a2a3670b415
2021-05-31 12:07:07 +00:00
Robert Greenwalt
f42ef7ec79 am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom am: bc75548c32
Original change: undetermined

Change-Id: I059d66b286a93fbcac7deee5622de356139fb3db
2021-05-31 12:06:45 +00:00
Wink Saville
57c597479a am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom am: 693ee83a6c
Original change: undetermined

Change-Id: Id383cd417423bf10b36a2fa72dca201f4657114d
2021-05-31 12:06:33 +00:00
Wink Saville
a44ce78998 am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom am: 933cb47f64
Original change: undetermined

Change-Id: I2f246edf512dc99507f9e2e5af5ffd13808293b5
2021-05-31 12:06:20 +00:00
Irfan Sheriff
74bf43eba2 Change hostname format to conform to specification am: 4aa0b2ece5
Original change: undetermined

Change-Id: I0913dac2580abc094d88d282bb120ba22d127400
2021-05-31 12:06:07 +00:00
Jeff Sharkey
c23a30a71e Sample atomic network stats buckets, full poll. am: f444762587
Original change: undetermined

Change-Id: Ic6f280e241b0ea70007f9eb3822f8361924f0582
2021-05-31 12:05:53 +00:00
Jeff Sharkey
ad15380803 am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom am: c611ea2aac
Original change: undetermined

Change-Id: I85fba6bf800d3385768b9531755d2d286b9cad09
2021-05-31 12:05:41 +00:00