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 |
|
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 |
|
Robert Greenwalt
|
a237aa4df0
|
am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp am: e698829381 am: 0f36cf0650
Original change: undetermined
Change-Id: I3c4f4aa4fffb21ad604e1af052a42f0d147a0997
|
2021-05-31 11:41:17 +00:00 |
|
Michael Jurka
|
4fd3fc49c9
|
Fix the build am: 837e36441b am: dc2e998900
Original change: undetermined
Change-Id: Ia9f951180eb663af04da056ffe0ca239ea42c1fa
|
2021-05-31 11:41:04 +00:00 |
|
Robert Greenwalt
|
f74dba2439
|
am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp am: fbba87d35f am: 29dfe3c0d6
Original change: undetermined
Change-Id: I1eb46f44bbe4db2f4ffb68f99f1ab904efa17e08
|
2021-05-31 11:40:50 +00:00 |
|
Robert Greenwalt
|
92f86cfdad
|
am 5635dc93: am 23a9f024: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 am: b471d761d2 am: a1dc2171eb
Original change: undetermined
Change-Id: Ifd64490d7d8fcbb3f47d3a3d8cdc01e4abadbedb
|
2021-05-31 11:40:36 +00:00 |
|
Wink Saville
|
3b13cbd4d2
|
am d9ca063d: (-s ours) am 64cd47c2: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE am: 2bd5274d1b am: 0eabf36034
Original change: undetermined
Change-Id: Idab2f5ec15360ed0c2c05fcd6ee0a179cafc7190
|
2021-05-31 11:40:23 +00:00 |
|
Wink Saville
|
36badb53f0
|
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
Original change: undetermined
Change-Id: Ibc89e647331b7e008ecd6a28bbedd9a3e4b105d3
|
2021-05-31 11:40:10 +00:00 |
|
Robert Greenwalt
|
e24e4c1d84
|
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
Original change: undetermined
Change-Id: Ic03cac5e8c77c31e9fe4a1f275a1336b94335ebc
|
2021-05-31 11:39:56 +00:00 |
|
Benoit Goby
|
b0de43fb0c
|
Add support for USB Ethernet adapters am: 211b569c04 am: 85883a2026 am: d9adf42b29
Original change: undetermined
Change-Id: Ic55d138f7eaf8c6d8492e10bd0b68431a2da7084
|
2021-05-31 11:39:43 +00:00 |
|
TK MUN
|
0a553eda3e
|
am 423572b4: (-s ours) am 8cca8f4c: (-s ours) am 141623d4: DO NOT MERGE WiMAX support am: a845f59853 am: fad502da83
Original change: undetermined
Change-Id: I21cd23fe434036ec005d04ae9019e08e090ce588
|
2021-05-31 11:39:43 +00:00 |
|
Wink Saville
|
f72c5102a8
|
[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 am: 0e59db8ff3 am: a5e26750c4 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I9a83dce21834cc0f55d949f4fd0ebdd6a8f32332
|
2021-05-31 11:39:33 +00:00 |
|
Benoit Goby
|
d9adf42b29
|
Add support for USB Ethernet adapters am: 211b569c04 am: 85883a2026
Original change: undetermined
Change-Id: I3dca3b6c825e2a07608e4392f457d225f2e842ec
|
2021-05-31 11:39:30 +00:00 |
|
Robert Greenwalt
|
ea58548baa
|
Merge "Add some input checking to prevent problems" am: 0efe4aa812 am: 5cfa78aac8 am: e0737b3f31
Original change: undetermined
Change-Id: I19c46a9e3db1a2843767a5e4630592f45b89cc84
|
2021-05-31 11:39:25 +00:00 |
|
Wink Saville
|
a5e26750c4
|
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 am: 0e59db8ff3
Original change: undetermined
Change-Id: If54c57ce91a89711040c4b9acb1a88159cf11bb1
|
2021-05-31 11:39:17 +00:00 |
|
Robert Greenwalt
|
09f56dfe7e
|
Merge "Start using NetworkUtils.numericToInetAddress." am: 95c300a353 am: 864130aa3e am: 535f994413
Original change: undetermined
Change-Id: I010ad5ae85b511b241b6a11dd21d8c5d43b3b9c3
|
2021-05-31 11:39:12 +00:00 |
|
Robert Greenwalt
|
e0737b3f31
|
Merge "Add some input checking to prevent problems" am: 0efe4aa812 am: 5cfa78aac8
Original change: undetermined
Change-Id: I92ab9339dd54960c3da7eb2d6fe0a64a8daad64c
|
2021-05-31 11:39:03 +00:00 |
|
Wink Saville
|
9778e63ead
|
[automerger skipped] am 9160b66c: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb am: 732db29f81 am: 724cb546af am: 92f0156dd0 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I964d5f198d68eeb7bc46d7ea3fe8656f91e147c1
|
2021-05-31 11:39:01 +00:00 |
|
Robert Greenwalt
|
255bc7a1a2
|
Merge "Fixing the write of BackgroundData setting." am: af83ea6e1f am: 9f5f584038 am: 9486525856
Original change: undetermined
Change-Id: Ib7d32e95cc50e9bb8bef28fd6a800bcfe041af23
|
2021-05-31 11:38:53 +00:00 |
|
Robert Greenwalt
|
535f994413
|
Merge "Start using NetworkUtils.numericToInetAddress." am: 95c300a353 am: 864130aa3e
Original change: undetermined
Change-Id: Ic7a4d29f8abc4cc3237042496b4409eb2e3c8a70
|
2021-05-31 11:38:50 +00:00 |
|
Wink Saville
|
06575622e1
|
LTE Changes for Telephony including Multiple PDN support and IPV6 support am: f6b7669493 am: ad6db9309e am: 74260ad862
Original change: undetermined
Change-Id: Ia80323d9227830f0acf34d36593da54d35f0ced0
|
2021-05-31 11:38:42 +00:00 |
|
Wink Saville
|
92f0156dd0
|
am 9160b66c: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb am: 732db29f81 am: 724cb546af
Original change: undetermined
Change-Id: I1c19a3a66afafd877abef7c9baf98792cd53a534
|
2021-05-31 11:38:37 +00:00 |
|