Chia-chi Yeh
|
30c5517f66
|
Merge "Do not register the callbacks in the constructor." am: ab2c05370e
Original change: undetermined
Change-Id: I1adadc9d0f203dd023c840c3c74c4b830dc8c03a
|
2021-05-31 04:22:58 +00:00 |
|
Jeff Sharkey
|
13fd2fd0d1
|
Collect historical network stats. am: d26449fd76
Original change: undetermined
Change-Id: I9cfd88e08a23ca267f16269d4eafc3bec87b35ff
|
2021-05-31 04:22:35 +00:00 |
|
Jeff Sharkey
|
ba9512ed4e
|
Policy and rules work for ConnectivityManager. am: 921ebf2ee5
Original change: undetermined
Change-Id: I6a752a33af2b09ea8eb30aeda7c81b6a5978510e
|
2021-05-31 04:22:20 +00:00 |
|
Mike Lockwood
|
f7610a2b6c
|
Move stringToFile utility from ConnectivityService to FileUtils am: 0d5916c21e
Original change: undetermined
Change-Id: Idaa4518441f2b815cff21e7eb4f29dd6f1a9a76d
|
2021-05-31 04:22:07 +00:00 |
|
Jeff Sharkey
|
9f29f87cf9
|
Merge "APIs to profile network usage for current UID." am: 0d49ed3ca8
Original change: undetermined
Change-Id: I3c33fa4bcebc56708b055e809cecaab8b85dd2e2
|
2021-05-31 04:21:52 +00:00 |
|
Robert Greenwalt
|
40003fdda9
|
am e0f7bc0b: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp am: 1b507045bd
Original change: undetermined
Change-Id: Ieea002a2d5952638e2442c1949d1b940d832dbac
|
2021-05-31 04:21:29 +00:00 |
|
The Android Open Source Project
|
e8603f236f
|
Reconcile with honeycomb-release am: 991f5f4ec9
Original change: undetermined
Change-Id: I945981a0a3ebb55ed845861e61745916cd61361c
|
2021-05-31 04:21:16 +00:00 |
|
The Android Open Source Project
|
9dbcfe9cd8
|
Reconcile with gingerbread-release am: 969a009cbd
Original change: undetermined
Change-Id: Ib496be27f87e11ab47d0630fa097ebe800810575
|
2021-05-31 04:21:03 +00:00 |
|
Wink Saville
|
15fb8b97a2
|
am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE am: 1dc369c378
Original change: undetermined
Change-Id: Id1a6e1aa960c9215ed6c7ea0acc82802ddbd353c
|
2021-05-31 04:20:50 +00:00 |
|
Jean-Baptiste Queru
|
62c474417b
|
Merge f024027b am: 65727c9c5d
Original change: undetermined
Change-Id: If1bc8d453c1c77ef0da4d512f4198a1c0379fa24
|
2021-05-31 04:20:34 +00:00 |
|
Kazuhiro Ondo
|
405c980020
|
am a9f139c4: am 3a34041f: Linkproperties update via unsol data call state change. am: 842c177850
Original change: undetermined
Change-Id: I798e9e69f7df371ab21ecdfdf0d8ac3c7a41f7e1
|
2021-05-31 04:20:21 +00:00 |
|
Irfan Sheriff
|
7702ce3994
|
am ea7aa92a: (-s ours) am 891bdee2: Merge commit \'01ea7f01\' into manualmerge1 am: bc7d82560f
Original change: undetermined
Change-Id: I6e7cd4bd0bf674b77c838833207200a4ac5e3846
|
2021-05-31 04:20:07 +00:00 |
|
Wink Saville
|
1396296ec9
|
am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE am: a8f3f7c298
Original change: undetermined
Change-Id: I89bbbf657d66b956da36a23038b85b454770eec0
|
2021-05-31 04:19:54 +00:00 |
|
Chia-chi Yeh
|
8d01fe5bbd
|
Extract NetworkManagementService out from Tethering to ConnectivityService. am: 4df51328bd
Original change: undetermined
Change-Id: Icbe7d395414ac854d7021c7c674523efd1cb9f60
|
2021-05-31 04:19:40 +00:00 |
|
Robert Greenwalt
|
3899890c8b
|
am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE am: b5c62b6230
Original change: undetermined
Change-Id: I7c82a639c584fcaffba3a0f8aecb4c71a29c9d1c
|
2021-05-31 04:19:25 +00:00 |
|
Robert Greenwalt
|
ed81cb1b62
|
am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE am: e7dcc1362f
Original change: undetermined
Change-Id: I4d0c40af1bcf65dbfce6d7713af3c3522a892487
|
2021-05-31 04:19:11 +00:00 |
|
Robert Greenwalt
|
d193b1675f
|
resolved conflicts for merge of 90faa5de to master am: b0d1452d58
Original change: undetermined
Change-Id: Iff3ae8bd5ce0104ae2898ea14b7b46dd3cd52a9f
|
2021-05-31 04:18:56 +00:00 |
|
Irfan Sheriff
|
604ce39cbf
|
am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE am: 52b5163b83
Original change: undetermined
Change-Id: Ib1c5eab17f8837bd737c05bae470dbdaddd5b3df
|
2021-05-31 04:18:43 +00:00 |
|
Robert Greenwalt
|
f6f1492436
|
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE am: ef903acab4
Original change: undetermined
Change-Id: I0ab2a606a12988fca3d2da8b1eda4babebae2115
|
2021-05-31 04:18:29 +00:00 |
|
Robert Greenwalt
|
b0ce34c497
|
Expose more net types to the public. am: f76c55d289
Original change: undetermined
Change-Id: I33894ff1963d60df73dc388faa96c400927b2779
|
2021-05-31 04:18:15 +00:00 |
|
Elliott Hughes
|
24d18a2322
|
More native code cleanup. am: c944a7dedc
Original change: undetermined
Change-Id: Idd9353213bb874e38cb2e70f53f96994a40c335b
|
2021-05-31 04:18:01 +00:00 |
|
Benoit Goby
|
2fdb105e9f
|
resolved conflicts for merge of d27954e0 to master am: ef54af248b
Original change: undetermined
Change-Id: I3ca9bce499f00f58d203cbc3bf31859c01de0030
|
2021-05-31 04:17:47 +00:00 |
|
Wink Saville
|
b1323e778f
|
am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE am: 75d9e1cd13
Original change: undetermined
Change-Id: Ie662c237940a2c9dd1e31091b78badc0027c2831
|
2021-05-31 04:17:33 +00:00 |
|
Robert Greenwalt
|
e2b705ef9b
|
am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp am: f7ca6f7ddf
Original change: undetermined
Change-Id: I07324dd380a1777f93780c5c310707a307a49f0f
|
2021-05-31 04:17:20 +00:00 |
|
John Wang
|
c98ccdfaef
|
am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE am: a8191da467
Original change: undetermined
Change-Id: Idd3cf07766b2331efda5cbf0f63a46d18337ca5f
|
2021-05-31 04:17:07 +00:00 |
|
Brian Carlstrom
|
7354b7a547
|
Don't use local ref for cached jclass reference in JNI code am: 587274ea3a
Original change: undetermined
Change-Id: I1ca10962155653de8b20434330ff25167ab0d6cf
|
2021-05-31 04:16:53 +00:00 |
|
Simon Wilson
|
56269cf79e
|
[automerger skipped] am 2e4b442d: (-s ours) am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread am: d2dc2511ec -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Id823e487563865316b9b587db1eaadee4da06436
|
2021-05-31 04:16:34 +00:00 |
|
Robert Greenwalt
|
105fa5bcbf
|
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp am: 198b24d59a
Original change: undetermined
Change-Id: Ibc51a632ebbfd884f237db9102fe018848052d21
|
2021-05-31 04:16:24 +00:00 |
|
Robert Greenwalt
|
f0b212080d
|
Fix a bad merge. am: 1e2f286a27
Original change: undetermined
Change-Id: I1fca58070f13b71bf954215ccfdf5526f0397406
|
2021-05-31 04:16:10 +00:00 |
|
Robert Greenwalt
|
e8b1cdaf05
|
am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp am: e698829381
Original change: undetermined
Change-Id: I772a8ffa08fe36faaf770318ebb9a7ddf2ff2b3e
|
2021-05-31 04:15:55 +00:00 |
|
Michael Jurka
|
cd37e3e9e6
|
Fix the build am: 837e36441b
Original change: undetermined
Change-Id: I9d6608d89b0d1ffa19cb327fb796cc2261d5211a
|
2021-05-31 04:15:41 +00:00 |
|
Robert Greenwalt
|
371fe796d6
|
am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp am: fbba87d35f
Original change: undetermined
Change-Id: Ieba908acd577b64db80e0c60d0586ee2f124522b
|
2021-05-31 04:15:23 +00:00 |
|
Robert Greenwalt
|
1dfca16df2
|
am 5635dc93: am 23a9f024: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 am: b471d761d2
Original change: undetermined
Change-Id: Ic0be29ccf2d73728904b2bafb0187d4f87383f90
|
2021-05-31 04:15:09 +00:00 |
|
Wink Saville
|
a7f3ca3116
|
[automerger skipped] am d9ca063d: (-s ours) am 64cd47c2: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE am: 2bd5274d1b -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I59e88cb17ea36186618ae7bc4223422c288d0b9c
|
2021-05-31 04:14:55 +00:00 |
|
Wink Saville
|
34fe9d8d28
|
[automerger skipped] am d7945967: (-s ours) am 7df32e6a: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE am: eaf8cd4a15 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Icbce4a22651d7761f8b67745043088be4543f438
|
2021-05-31 04:14:46 +00:00 |
|
Robert Greenwalt
|
8994151f67
|
[automerger skipped] am 5625a40c: (-s ours) am 102b5464: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread am: 0e8b9b6792 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I4a8908e524c537d0ea9f632c6a1ea1d887025817
|
2021-05-31 04:14:36 +00:00 |
|
TK MUN
|
7b7a27dd09
|
[automerger skipped] am 423572b4: (-s ours) am 8cca8f4c: (-s ours) am 141623d4: DO NOT MERGE WiMAX support am: a845f59853 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I4af4fafc0470558d667c60306801a393c37bdf8e
|
2021-05-31 04:14:26 +00:00 |
|
Benoit Goby
|
d9b13fe100
|
Add support for USB Ethernet adapters am: 211b569c04
Original change: undetermined
Change-Id: I1d7ded25c279a6df11aae0208fea5647020411d8
|
2021-05-31 04:13:42 +00:00 |
|
Wink Saville
|
5167991530
|
[automerger skipped] am 5cf1dbec: (-s ours) am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1 am: f23187ce09 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Idb15fa3a4d6b05f39d9e5a7cc2568c217ad964b9
|
2021-05-31 04:13:29 +00:00 |
|
Robert Greenwalt
|
86b33ccb29
|
Merge "Add some input checking to prevent problems" am: 0efe4aa812
Original change: undetermined
Change-Id: I4325bf00071f4319cbcec678ce7937915ab44a6a
|
2021-05-31 04:13:19 +00:00 |
|
Robert Greenwalt
|
7aeab5d74a
|
Merge "Start using NetworkUtils.numericToInetAddress." am: 95c300a353
Original change: undetermined
Change-Id: I79ed3614861d231cc6c34b3f94200ab93a7c8f2e
|
2021-05-31 04:12:57 +00:00 |
|
Wink Saville
|
9d07617d14
|
[automerger skipped] am 9160b66c: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb am: 732db29f81 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ic406895f95eef4fa03650982a00c4836064e06ed
|
2021-05-31 04:12:35 +00:00 |
|
Robert Greenwalt
|
46206f2f4f
|
Merge "Fixing the write of BackgroundData setting." am: af83ea6e1f
Original change: undetermined
Change-Id: Ife22a8e391711d10f40a53b7f19fab4dac099fae
|
2021-05-31 04:12:23 +00:00 |
|
Wink Saville
|
929677b1a0
|
LTE Changes for Telephony including Multiple PDN support and IPV6 support am: f6b7669493
Original change: undetermined
Change-Id: Id7bdf1299cf4dcb6e441d698899e7e0bde4eb35d
|
2021-05-31 04:12:00 +00:00 |
|
Robert Greenwalt
|
cdd3daf5a0
|
[automerger skipped] am 439a015b: (-s ours) am 730126bf: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread am: 8606b3e4a0 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I5b7ff917fa65e6b6e86b9f9b331b384d782aab06
|
2021-05-31 04:11:45 +00:00 |
|
Elliott Hughes
|
3a275d6187
|
Use InetAddress.parseNumericAddress. am: 3064b9e18e
Original change: undetermined
Change-Id: Ie50a7ffa4340fe6df5b052ace14c7d366034ab3f
|
2021-05-31 04:11:36 +00:00 |
|
Robert Greenwalt
|
36b9d73103
|
Remove more use of netmask am: 7fae12cc19
Original change: undetermined
Change-Id: I6215f011ed6822bcd7a0434e95b0fe9e5441b8ff
|
2021-05-31 04:11:20 +00:00 |
|
Robert Greenwalt
|
dcd0550c24
|
Update LinkProperties treatment of gateways am: 5c733977a4
Original change: undetermined
Change-Id: Ia225c9effe07ada2a9ba042ed45bda1a1104d845
|
2021-05-31 04:11:02 +00:00 |
|
The Android Open Source Project
|
1bcfc464b8
|
am 44d258d5: Reconcile gingerbread-plus-aosp and honeycomb am: 20bbfe73dd
Original change: undetermined
Change-Id: I4c78ff488e1660990f5d098d47deb5d70d134c6d
|
2021-05-31 04:10:50 +00:00 |
|
Robert Greenwalt
|
b1f07847bf
|
am 996d60e3: resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp am: f2b39b4773
Original change: undetermined
Change-Id: Ic91787135965a9617152f79b7a478a8f0e125609
|
2021-05-31 04:10:37 +00:00 |
|