Simon Wilson
0249717644
am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 12:25:25 -07:00
Robert Greenwalt
e00e35a54c
am 9991017b: Only leave one default network up at a time.
...
* commit '9991017bbd026080695fc33198609be7bfd4f9be':
Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Robert Greenwalt
1e2f286a27
Fix a bad merge.
...
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread
after the bad merge was reverted by master change 104487
(Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4).
bug:4157610
Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
2011-04-01 10:51:22 -07:00
Robert Greenwalt
e698829381
am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp
...
* commit '026ba931d448919ffc515f7e66fe96950f89d22e':
Fix the build.
2011-03-31 10:53:58 -07:00
Robert Greenwalt
f7dae30b20
Fix the build.
...
Fix a bad merge.
Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
2011-03-31 10:44:47 -07:00
Michael Jurka
837e36441b
Fix the build
...
Revert "am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp"
This reverts commit fbba87d35f , reversing
changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
2011-03-30 19:57:12 -07:00
The Android Automerger
358c8e7cdc
merge in gingerbread-release history after reset to gingerbread
2011-03-30 18:33:05 -07:00
Robert Greenwalt
fbba87d35f
am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '047f9d12976d90d0931a64a256bb4843d77f5e20':
Fix some alt-network issues.
2011-03-30 16:40:23 -07:00
Robert Greenwalt
3a378b9f2d
resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp
...
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
2011-03-30 15:03:13 -07:00
TK MUN
dc9a535917
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
...
When user uncheck "Data Enabled" check box, WiMAX goes
into "disconnected" state.
Change-Id: I3b9bdbc16cc4ddbf7a1aac0c984cad8994c4e9f2
Signed-off-by: TK MUN <tk.mun@samsung.com >
2011-03-30 13:18:23 -07:00
Robert Greenwalt
b2f5deca7d
am 568845a7: Merge "Fix some alt-network issues." into gingerbread
...
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Robert Greenwalt
9991017bbd
Only leave one default network up at a time.
...
If original refuses to tear down, tear down new one. It's better
to have none (which will try to launch them all again) than two.
Really people shouldn't refuse the teardown request.
bug:4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
2011-03-29 11:36:28 -07:00
The Android Automerger
3e3509861a
merge in gingerbread-release history after reset to gingerbread
2011-03-28 16:31:27 -07:00
The Android Automerger
a195a2cf8a
merge in gingerbread-release history after reset to gingerbread
2011-03-25 14:32:36 -07:00
Robert Greenwalt
a71471ba9a
Fix some alt-network issues.
...
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
it is active.
bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
2011-03-25 08:59:08 -07:00
The Android Automerger
1729058e3b
merge in gingerbread-release history after reset to gingerbread
2011-03-23 05:43:33 -07:00
Robert Greenwalt
b471d761d2
am 5635dc93: am 23a9f024: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit '5635dc9313dc6ca3ea739e4ca36c42a2c58537e9':
Fix adding of default route.
2011-03-22 21:40:54 -07:00
Robert Greenwalt
23a9f02497
am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
Fix adding of default route.
2011-03-22 21:37:48 -07:00
Robert Greenwalt
03d53da1f5
Fix adding of default route.
...
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway. Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.
This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).
Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route. This allows the default add to succeed.
bug:3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
2011-03-22 18:47:42 -07:00
Wink Saville
2bd5274d1b
am d9ca063d: (-s ours) am 64cd47c2: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
...
* commit 'd9ca063d92b2ff980fa0e0e14955f837fcf75946':
Do not merge: Add some input checking to prevent problems
2011-03-14 13:47:12 -07:00
Wink Saville
eaf8cd4a15
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
...
* commit 'd79459670576da8aafc831ac0872f550d4137164':
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-14 13:45:19 -07:00
Wink Saville
64cd47c239
Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
2011-03-14 13:41:26 -07:00
Wink Saville
7df32e6a39
Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
2011-03-14 13:40:58 -07:00
Robert Greenwalt
dab2c6223e
Do not merge: Add some input checking to prevent problems
...
Adding nulls can cause unhappiness. It's suspected as a cause of 3495045.
bug:3495045
Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351
2011-03-14 12:25:09 -07:00
Wink Saville
b7c92c720f
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
...
This reverts commit bbba216fe3
and is the first of the LTE commits in master being back ported
to the LTE branch.
Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
2011-03-14 12:25:04 -07:00
Robert Greenwalt
0e8b9b6792
am 5625a40c: (-s ours) am 102b5464: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
...
* commit '5625a40c22303cfda31c604e701e07655a20ec3b':
DO NOT MERGE Backport of I1f55df8a from master.
2011-03-14 12:05:41 -07:00
Robert Greenwalt
5625a40c22
am 102b5464: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
...
* commit '102b5464b7d18fb36f58a3638ee72e8d6b54bd09':
DO NOT MERGE Backport of I1f55df8a from master.
2011-03-14 10:53:38 -07:00
The Android Automerger
4424afd194
merge in gingerbread-release history after reset to gingerbread
2011-03-12 11:56:25 -08:00
Robert Greenwalt
102b5464b7
am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
...
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
DO NOT MERGE Backport of I1f55df8a from master.
2011-03-11 11:52:31 -08:00
The Android Automerger
61a8585bca
merge in gingerbread-release history after reset to gingerbread
2011-03-11 10:35:46 -08:00
Robert Greenwalt
9e081592aa
DO NOT MERGE Backport of I1f55df8a from master.
...
Fixes false reporting of NO_CONNECTION.
bug:4057115
Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
2011-03-10 17:04:21 -08:00
TK MUN
a845f59853
am 423572b4: (-s ours) am 8cca8f4c: (-s ours) am 141623d4: DO NOT MERGE WiMAX support
...
* commit '423572b4e2111a38553e2cc9fb239e1b0577cbab':
DO NOT MERGE WiMAX support
2011-03-09 23:03:16 -08:00
TK MUN
423572b4e2
am 8cca8f4c: (-s ours) am 141623d4: DO NOT MERGE WiMAX support
...
* commit '8cca8f4c4fbb4ffe2e5e83b91d17eba6ba28f950':
DO NOT MERGE WiMAX support
2011-03-09 22:58:12 -08:00
TK MUN
8cca8f4c4f
am 141623d4: DO NOT MERGE WiMAX support
...
* commit '141623d480fe0a6944e5bfea04a2dd4f78b52f20':
DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
TK MUN
141623d480
DO NOT MERGE WiMAX support
...
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX
Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com >
2011-03-09 22:37:08 -08:00
The Android Automerger
90c4b17566
merge in gingerbread-release history after reset to gingerbread
2011-03-04 21:56:46 -08:00
Benoit Goby
211b569c04
Add support for USB Ethernet adapters
...
Change-Id: Ie75cbcdb1b0c8965b59b89675a05175a1e9ebdd6
2011-03-04 15:42:23 -08:00
Wink Saville
f23187ce09
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
...
* commit '5cf1dbec1b1d534863f03fc166c7289c4a9d399c':
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-04 01:01:04 -08:00
The Android Automerger
11b76f54de
merge in gingerbread-release history after reset to gingerbread
2011-03-03 14:17:48 -08:00
Wink Saville
bbba216fe3
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
...
This reverts commit f6b7669493 .
Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
2011-03-03 09:53:52 -08:00
Robert Greenwalt
0efe4aa812
Merge "Add some input checking to prevent problems"
2011-03-03 08:32:53 -08:00
Robert Greenwalt
0ce55042b4
Add some input checking to prevent problems
...
Adding nulls can cause unhappiness. It's suspected as a cause of 3495045.
bug:3495045
Change-Id: I1d83a5461caa0b8de9602f93a40681e7963b915e
2011-03-02 17:03:37 -08:00
Robert Greenwalt
95c300a353
Merge "Start using NetworkUtils.numericToInetAddress."
2011-03-02 12:10:51 -08:00
Robert Greenwalt
35e34d1276
Start using NetworkUtils.numericToInetAddress.
...
Generates InetAddresses without risking an accidental dns lookup. For use with supposedly
numeric-only ip address strings.
Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
2011-03-02 11:37:32 -08:00
Wink Saville
732db29f81
am 9160b66c: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
...
* commit '9160b66c714d9a90d36c235540180cd4c65fed82':
Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-03-01 10:58:05 -08:00
Wink Saville
ad61dad060
Fixing the write of BackgroundData setting, DO NOT MERGE.
...
I outsmarted myself trying to minimize writes and caused no writes to occur.
bug:3485934
Change-Id: I43b6ebbed3f13277edfb2e28f09cf7b98ea66776
2011-02-28 16:40:14 -08:00
Wink Saville
9160b66c71
am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
...
* commit '0eb6af892948ba23bf9de5c5a6172c6ec50f8f71':
Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-02-28 16:00:22 -08:00
Wink Saville
28b7b21694
Fixing the write of BackgroundData setting, DO NOT MERGE.
...
I outsmarted myself trying to minimize writes and caused no writes to occur.
bug:3485934
Change-Id: I43b6ebbed3f13277edfb2e28f09cf7b98ea66776
2011-02-28 15:32:41 -08:00
Robert Greenwalt
af83ea6e1f
Merge "Fixing the write of BackgroundData setting."
2011-02-25 15:20:30 -08:00
Robert Greenwalt
0ffdef120a
Fixing the write of BackgroundData setting.
...
I outsmarted myself trying to minimize writes and caused no writes to occur.
bug:3485934
Change-Id: I292e6837d29903a21abb6e001d25d96a4cdc18ec
2011-02-25 13:44:09 -08:00