Wink Saville
|
afafe65ff9
|
am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE am: 1dc369c378 am: 0655a61541 am: 20aa545f6d
Original change: undetermined
Change-Id: Ibf300683487558133cad11e4010661b5f92bad73
|
2021-05-31 12:08:27 +00:00 |
|
Jean-Baptiste Queru
|
8277e4862b
|
Merge f024027b am: 65727c9c5d am: 5b21e068f1 am: af14a5af5e
Original change: undetermined
Change-Id: Idc1335e873001680b4653c519ae55e5e1321dfc3
|
2021-05-31 12:08:16 +00:00 |
|
Kazuhiro Ondo
|
bdd97cdcb8
|
am a9f139c4: am 3a34041f: Linkproperties update via unsol data call state change. am: 842c177850 am: a9266ebc4f am: c38857975a
Original change: undetermined
Change-Id: I61b38ab9501f76dca0868f5feb0178ec691a302c
|
2021-05-31 12:08:04 +00:00 |
|
Irfan Sheriff
|
890d16bc51
|
am ea7aa92a: (-s ours) am 891bdee2: Merge commit \'01ea7f01\' into manualmerge1 am: bc7d82560f am: c21a957b45 am: 98c9400728
Original change: undetermined
Change-Id: I58f80b6d27789fdd3d8ee66d98190240dfa5e66f
|
2021-05-31 12:07:52 +00:00 |
|
Wink Saville
|
ddabe40fbd
|
am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE am: a8f3f7c298 am: bfb78d7880 am: faf430b32c
Original change: undetermined
Change-Id: I88615b749bab5b9fc311c5030cd5274bb832bb33
|
2021-05-31 12:07:40 +00:00 |
|
Chia-chi Yeh
|
5df3049f98
|
Extract NetworkManagementService out from Tethering to ConnectivityService. am: 4df51328bd am: ccf66691c9 am: ff992595ea
Original change: undetermined
Change-Id: I722588ab0c6b98efcd81abb82007b77646840c66
|
2021-05-31 12:07:28 +00:00 |
|
Robert Greenwalt
|
f9f2f925f6
|
am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE am: b5c62b6230 am: e4cd798f6d am: 6556fc6536
Original change: undetermined
Change-Id: I430734cfd6376e16f4246e3ec6e8dea2fec8db3e
|
2021-05-31 12:07:15 +00:00 |
|
Robert Greenwalt
|
d395819431
|
am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE am: e7dcc1362f am: 3131fedb76 am: 316829c39a
Original change: undetermined
Change-Id: I8dde5052d5f3314011d705c5292293475538510d
|
2021-05-31 12:07:02 +00:00 |
|
Robert Greenwalt
|
5b0383f7a5
|
resolved conflicts for merge of 90faa5de to master am: b0d1452d58 am: 7b76c95d85 am: 26405858bc
Original change: undetermined
Change-Id: Ia08608b5406e3efff999d231379af13c7010b759
|
2021-05-31 12:06:50 +00:00 |
|
Irfan Sheriff
|
63e5c7549f
|
am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE am: 52b5163b83 am: 9e88a39d63 am: 96bc459c63
Original change: undetermined
Change-Id: I895b71fb9da807615444675cc5ee0cabc6bf7ff8
|
2021-05-31 12:06:38 +00:00 |
|
Robert Greenwalt
|
2e9e4fa330
|
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE am: ef903acab4 am: 655ffb0c17 am: cb192bba92
Original change: undetermined
Change-Id: Icd10a148f59d502b58cb1f800afe5e1686105c5c
|
2021-05-31 12:06:25 +00:00 |
|
Robert Greenwalt
|
1c16beaafe
|
Expose more net types to the public. am: f76c55d289 am: 3fade91d84 am: e98f3d7c66
Original change: undetermined
Change-Id: I97700fab7955c44537b79eafe8dc07b25afaa744
|
2021-05-31 12:06:13 +00:00 |
|
Elliott Hughes
|
5037c48ef9
|
More native code cleanup. am: c944a7dedc am: 9e5fd38c42 am: 6b58c34ddd
Original change: undetermined
Change-Id: I39bcb2642a758bd813f65bc11113ac0e0eead1d7
|
2021-05-31 12:06:01 +00:00 |
|
Benoit Goby
|
4e1567b3b1
|
resolved conflicts for merge of d27954e0 to master am: ef54af248b am: 50885c55bb am: a51c661cbc
Original change: undetermined
Change-Id: I1fe497bb023b019a00621e5cba60f344d89c1e8b
|
2021-05-31 12:05:49 +00:00 |
|
Wink Saville
|
0047177cdf
|
am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE am: 75d9e1cd13 am: 90b9909493 am: 33f3c20627
Original change: undetermined
Change-Id: Ie64eaeb14303d28af9ca7d560cbe1c5143c2c3e7
|
2021-05-31 12:05:37 +00:00 |
|
Robert Greenwalt
|
d4f376f7a3
|
am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp am: f7ca6f7ddf am: 1502bc55a8 am: be2039fe98
Original change: undetermined
Change-Id: I88ba80832f7e03a591c0e663e48ac4286ac2f330
|
2021-05-31 12:05:25 +00:00 |
|
John Wang
|
b4345d536b
|
am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE am: a8191da467 am: eb922405e8 am: 1c78694373
Original change: undetermined
Change-Id: I776691f66033638a955d72ec4ff01a223bc6c2a8
|
2021-05-31 12:05:13 +00:00 |
|
Brian Carlstrom
|
0f33213f40
|
Don't use local ref for cached jclass reference in JNI code am: 587274ea3a am: 6e90d05342 am: ab2023a847
Original change: undetermined
Change-Id: I85ea020c45db1c4b0c3f1ffb9458e187a6f0d024
|
2021-05-31 12:04:59 +00:00 |
|
Simon Wilson
|
6559164262
|
[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 am: 9bfd950113 am: e4eecbb1f8 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ia9554591aa65766ff5270e503b39e65bb004fb9c
|
2021-05-31 12:04:47 +00:00 |
|
Robert Greenwalt
|
b0fd216df4
|
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp am: 198b24d59a am: 923b316408 am: 5e8f6ed01b
Original change: undetermined
Change-Id: I924fc046d7d4bb382a6c20a022024eb4ca761f01
|
2021-05-31 12:04:38 +00:00 |
|
Wink Saville
|
20aa545f6d
|
am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE am: 1dc369c378 am: 0655a61541
Original change: undetermined
Change-Id: I1ecd6c0db05c74b063aa3518ef7d1e2959eb0a2e
|
2021-05-31 11:56:57 +00:00 |
|
Jean-Baptiste Queru
|
af14a5af5e
|
Merge f024027b am: 65727c9c5d am: 5b21e068f1
Original change: undetermined
Change-Id: I6ce1e450b929ba94a77d9c89a31ec4a7c9a45f37
|
2021-05-31 11:56:44 +00:00 |
|
Kazuhiro Ondo
|
c38857975a
|
am a9f139c4: am 3a34041f: Linkproperties update via unsol data call state change. am: 842c177850 am: a9266ebc4f
Original change: undetermined
Change-Id: I0bf34fcc52afa87d37a5c35ba7c41c391e56fda4
|
2021-05-31 11:56:32 +00:00 |
|
Irfan Sheriff
|
98c9400728
|
am ea7aa92a: (-s ours) am 891bdee2: Merge commit \'01ea7f01\' into manualmerge1 am: bc7d82560f am: c21a957b45
Original change: undetermined
Change-Id: I315d91a1a1377596d3312442e9a7199b28a201b5
|
2021-05-31 11:56:18 +00:00 |
|
Wink Saville
|
faf430b32c
|
am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE am: a8f3f7c298 am: bfb78d7880
Original change: undetermined
Change-Id: I68429f71c31b134b6a4160ac89005acc639eef6a
|
2021-05-31 11:56:05 +00:00 |
|
Chia-chi Yeh
|
ff992595ea
|
Extract NetworkManagementService out from Tethering to ConnectivityService. am: 4df51328bd am: ccf66691c9
Original change: undetermined
Change-Id: I8713b974b83c109466643c26a4597e25c700ad43
|
2021-05-31 11:55:51 +00:00 |
|
Robert Greenwalt
|
6556fc6536
|
am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE am: b5c62b6230 am: e4cd798f6d
Original change: undetermined
Change-Id: Idc41465bbe128cc67a371b46023b92a848a44a0a
|
2021-05-31 11:55:37 +00:00 |
|
Robert Greenwalt
|
316829c39a
|
am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE am: e7dcc1362f am: 3131fedb76
Original change: undetermined
Change-Id: I718e97d785293225db42b401a60b6c208d2812e2
|
2021-05-31 11:55:23 +00:00 |
|
Robert Greenwalt
|
26405858bc
|
resolved conflicts for merge of 90faa5de to master am: b0d1452d58 am: 7b76c95d85
Original change: undetermined
Change-Id: If736b772f4e79d76dc3d1f569cd74a661df2f850
|
2021-05-31 11:55:10 +00:00 |
|
Irfan Sheriff
|
96bc459c63
|
am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE am: 52b5163b83 am: 9e88a39d63
Original change: undetermined
Change-Id: I134997aa6b1cc3ca471742c7cff1c0dbf760c576
|
2021-05-31 11:54:56 +00:00 |
|
Robert Greenwalt
|
cb192bba92
|
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE am: ef903acab4 am: 655ffb0c17
Original change: undetermined
Change-Id: Ifb182ea2c74808f3fdf8ca0a88d6eb6ebe5fb58d
|
2021-05-31 11:54:42 +00:00 |
|
Robert Greenwalt
|
e98f3d7c66
|
Expose more net types to the public. am: f76c55d289 am: 3fade91d84
Original change: undetermined
Change-Id: I81da354de8f249e276def63cf47635466f2e41e8
|
2021-05-31 11:54:28 +00:00 |
|
Elliott Hughes
|
6b58c34ddd
|
More native code cleanup. am: c944a7dedc am: 9e5fd38c42
Original change: undetermined
Change-Id: Ic4342dcbf153801732337fe1ca8979b3d60042c5
|
2021-05-31 11:54:14 +00:00 |
|
Benoit Goby
|
a51c661cbc
|
resolved conflicts for merge of d27954e0 to master am: ef54af248b am: 50885c55bb
Original change: undetermined
Change-Id: I9aab54f02555eef00d558d7b1521a04c38af7639
|
2021-05-31 11:54:01 +00:00 |
|
Wink Saville
|
33f3c20627
|
am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE am: 75d9e1cd13 am: 90b9909493
Original change: undetermined
Change-Id: Ib355e0b4b0feb80aa4af2f2789cd73e9e1c496de
|
2021-05-31 11:53:49 +00:00 |
|
Robert Greenwalt
|
be2039fe98
|
am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp am: f7ca6f7ddf am: 1502bc55a8
Original change: undetermined
Change-Id: If9e55141e4481733b55224d9daa22f42f916dac8
|
2021-05-31 11:53:35 +00:00 |
|
John Wang
|
1c78694373
|
am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE am: a8191da467 am: eb922405e8
Original change: undetermined
Change-Id: I779c2f5f4eaa139cd23cfb481d38070744f17339
|
2021-05-31 11:53:21 +00:00 |
|
Brian Carlstrom
|
ab2023a847
|
Don't use local ref for cached jclass reference in JNI code am: 587274ea3a am: 6e90d05342
Original change: undetermined
Change-Id: I98d31da6d4a855c5e665a328aa4ecee000fef239
|
2021-05-31 11:53:08 +00:00 |
|
Simon Wilson
|
e4eecbb1f8
|
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 am: 9bfd950113
Original change: undetermined
Change-Id: I85c3bf10849bbf8ce04d23c828dc74135b458dde
|
2021-05-31 11:52:54 +00:00 |
|
Robert Greenwalt
|
5e8f6ed01b
|
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp am: 198b24d59a am: 923b316408
Original change: undetermined
Change-Id: I636229514903ff4c46c46d3b6acb9ca2fbb7dd55
|
2021-05-31 11:52:40 +00:00 |
|
Robert Greenwalt
|
6beeab358a
|
Fix a bad merge. am: 1e2f286a27 am: 480be04b6d am: 2f0c0737a1
Original change: undetermined
Change-Id: Idc8860e46dfd9dcb085e53c0766c2ca31223d1a9
|
2021-05-31 11:43:43 +00:00 |
|
Robert Greenwalt
|
358a26990e
|
am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp am: e698829381 am: 0f36cf0650 am: a237aa4df0
Original change: undetermined
Change-Id: If65abefbd3df282355432032ee0e05cf6a194d06
|
2021-05-31 11:43:30 +00:00 |
|
Michael Jurka
|
b17c59e25e
|
Fix the build am: 837e36441b am: dc2e998900 am: 4fd3fc49c9
Original change: undetermined
Change-Id: I377d86dee255ffa60f424fa2170e228bfa4f3616
|
2021-05-31 11:43:18 +00:00 |
|
Robert Greenwalt
|
cb24bd2361
|
am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp am: fbba87d35f am: 29dfe3c0d6 am: f74dba2439
Original change: undetermined
Change-Id: If8288523e132a0474bb53909a92795cefab42e59
|
2021-05-31 11:43:06 +00:00 |
|
Robert Greenwalt
|
5bcf61aa37
|
am 5635dc93: am 23a9f024: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 am: b471d761d2 am: a1dc2171eb am: 92f86cfdad
Original change: undetermined
Change-Id: I01343529a8a2057a55535103140030a3e2408b83
|
2021-05-31 11:42:53 +00:00 |
|
Wink Saville
|
3a39891144
|
[automerger skipped] am d9ca063d: (-s ours) am 64cd47c2: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE am: 2bd5274d1b am: 0eabf36034 am: 3b13cbd4d2 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I6d5e4b3a769bad200feba5864991f40335c698d4
|
2021-05-31 11:42:41 +00:00 |
|
Wink Saville
|
f46a2fa157
|
[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 am: dd2b03bb38 am: 36badb53f0 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I685aa16103fc0aa0ab20eb2e813f219f0f4e367b
|
2021-05-31 11:42:34 +00:00 |
|
Robert Greenwalt
|
fc514d1acc
|
[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 am: e8adb20e43 am: e24e4c1d84 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I71b854f464acb4bbfeed90c33d393a7ea91cf0a3
|
2021-05-31 11:42:26 +00:00 |
|
TK MUN
|
2a0b474a50
|
[automerger skipped] am 423572b4: (-s ours) am 8cca8f4c: (-s ours) am 141623d4: DO NOT MERGE WiMAX support am: a845f59853 am: fad502da83 am: 0a553eda3e -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I7c159e2eb1e29591c496e28fbfa30560967b4da5
|
2021-05-31 11:42:18 +00:00 |
|
Robert Greenwalt
|
2f0c0737a1
|
Fix a bad merge. am: 1e2f286a27 am: 480be04b6d
Original change: undetermined
Change-Id: Ic6f3022c19b61c067b46589f4565b1d9d8339d73
|
2021-05-31 11:41:31 +00:00 |
|