Commit Graph

419 Commits

Author SHA1 Message Date
Elliott Hughes
c944a7dedc More native code cleanup.
Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.

Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
2011-04-12 11:28:59 -07:00
Benoit Goby
ef54af248b resolved conflicts for merge of d27954e0 to master
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
2011-04-11 19:07:11 -07:00
Benoit Goby
d27954e05a am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
* commit 'c40de32ef747fc206d3ec2980b8f7a7aff0f1967':
  Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
c40de32ef7 resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Benoit Goby
6cec7f3535 Add support for USB Ethernet adapters
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Wink Saville
75d9e1cd13 am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
* commit '75b5e9967f4c61642316c8a8a861c51d2aa3faeb':
  ConnectivityService needs to use the new names for the NetConfig vars.
2011-04-07 14:31:20 -07:00
Wink Saville
75b5e9967f am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
  ConnectivityService needs to use the new names for the NetConfig vars.
2011-04-07 14:29:17 -07:00
Wink Saville
f2a6283da9 ConnectivityService needs to use the new names for the NetConfig vars.
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
2011-04-07 14:23:45 -07:00
Robert Greenwalt
f7ca6f7ddf am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
* commit '1a087f0f01e4ea6900e5d922df68cbe908d6d1c9':
  Add external dependency API.
2011-04-07 14:22:03 -07:00
Robert Greenwalt
1a087f0f01 resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
2879f7352b Merge "Add external dependency API." into honeycomb-LTE 2011-04-07 13:02:28 -07:00
John Wang
a8191da467 am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
* commit 'f2cc9d1c7a54d92ed5d8357253963db4b614d203':
  Make LinkProperties comparable.
2011-04-07 12:48:17 -07:00
John Wang
f2cc9d1c7a am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.
2011-04-07 12:46:18 -07:00
John Wang
3e567d5c3a Make LinkProperties comparable.
Add equals() and hashcode() to LinkProperties and related fields.

Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
2011-04-07 12:36:56 -07:00
Robert Greenwalt
34848c0192 Add external dependency API.
An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Brian Carlstrom
587274ea3a Don't use local ref for cached jclass reference in JNI code
Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b
related-to-bug: 4241138
2011-04-06 10:04:20 -07:00
Simon Wilson
d2dc2511ec am 2e4b442d: (-s ours) am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit '2e4b442d54dfd8b777a9f3f202407880bc33adfe':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-05 10:26:54 -07:00
Simon Wilson
2e4b442d54 am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit '0249717644b0f4f1f3f0316e2de2930a16b019bc':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 17:44:38 -07:00
Robert Greenwalt
198b24d59a am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp
* commit '18510113794df002ee288d8d5fdf8b64b4c957b5':
  Only leave one default network up at a time.
2011-04-04 16:44:25 -07:00
Robert Greenwalt
1851011379 resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
2011-04-04 16:26:42 -07:00
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