5483 Commits

Author SHA1 Message Date
Benoit Goby
316594715d am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
2869d1715d resolved conflicts for merge of 08c39c6a to honeycomb-LTE
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
07c25b6512 am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '4430670f48f75661293371dab8db55865f5f56e0':
  audioflinger: Enable ARMv5TE optimized resampler
2011-04-11 17:27:12 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Wink Saville
de1b950d2b 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
975c8488a3 ConnectivityService needs to use the new names for the NetConfig vars.
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
2011-04-07 14:23:45 -07:00
Robert Greenwalt
f4a29403ae resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
d55a6b498d 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
Brad Fitzpatrick
4430670f48 am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
  audioflinger: Enable ARMv5TE optimized resampler
2011-04-07 09:08:58 -07:00
Jim Huang
592a6d9768 audioflinger: Enable ARMv5TE optimized resampler
Previously, the optimized asm option is only enabled when
__ARM_ARCH_5E__ is defined, which is assigned in armv5te.mk
rather than armv7-a series targets.  This patch checks the ARM CPU
feature about half-word multiply instructions to enable ARMv5TE
resampler optimization routines properly.

Change-Id: I4c5a5d8c932416f23bedb0b389db958349f21ea4
2011-04-07 21:08:39 +08:00
Robert Greenwalt
e716a5515b resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
2011-04-04 16:26:42 -07:00
Brad Fitzpatrick
8f7aad147d am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
2011-04-04 15:25:21 -07:00
Mike Lockwood
179122ad56 am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit 'a8731e1e922512e5c22485e48059f33b61ab93ea':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
2011-04-04 12:25:33 -07:00
Simon Wilson
d7a8e8453d 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
ab2194aade am 27725e8c: Only leave one default network up at a time.
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
  Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Brad Fitzpatrick
f7a34b1598 am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
2011-04-04 10:17:35 -07:00
Fredrik Helmer
a20c8ef471 Avoid crash in system server when mounting container
A race condition when mounting a container in PackageHelper may cause
the system_server to crash (uncaught exception). Calling methods are
prepared to handle null, so return null instead.

Change-Id: I852ee21a2d847e37d81c1b900c27ddf94ef24fcb
2011-04-04 14:38:24 +02:00
Robert Greenwalt
b1c6b0f1e2 Fix the build.
Fix a bad merge.

Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
2011-03-31 10:44:47 -07:00
Robert Greenwalt
6244f0fc16 resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
2011-03-30 15:03:13 -07:00
Mike Lockwood
a8731e1e92 Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 2011-03-30 14:15:51 -07:00
TK MUN
8a7fc0af61 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
Irfan Sheriff
11ebb6f502 am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
2011-03-30 09:30:32 -07:00
Robert Greenwalt
ce6766ea51 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
Brad Fitzpatrick
f68098534e am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
  Unregister callback from binder when vibration is removed
2011-03-30 08:20:51 -07:00
Mike Lockwood
8f2e3862bc DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level.  On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.

Change-Id: I2c4f6edb34aae2064f4b62ec0461d1fdd8770541
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-29 23:05:59 -07:00
Mike Lockwood
08d5de8339 am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
  UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:17:36 -07:00
Mike Lockwood
cd90d1f117 am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
  UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:16:17 -07:00
Mike Lockwood
4f0f3561ed UsbService: Make USB disconnect handling for accessory mode more robust
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level.  On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.

Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-29 16:59:38 -07:00
Robert Greenwalt
27725e8cd1 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
Mike Lockwood
038c7297c9 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:02:58 -07:00
Mike Lockwood
b115807aaf am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:00:33 -07:00
Brad Fitzpatrick
7a84a60d56 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Mike Lockwood
8f8c6023f2 UsbService: Fix JNI local reference leaks in the USB host support code
Bug: 4175857

Change-Id: I8b385f2257e509b0fb4d5f9516e9813b8165352d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-27 19:35:43 -07:00
Irfan Sheriff
05f14e2bcf Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
Irfan Sheriff
c0e0dbb454 DO NOT MERGE Pick upstream intf with valid IP conf
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I3e8ab5ef30b69f1adab755d83f5b65c078f73936
2011-03-25 10:09:55 -07:00
Robert Greenwalt
7cf5b419da 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
Mathias Jeppsson
b23949b745 Unregister callback from binder when vibration is removed
When creating new vibration pattern, a callback is registered
in case binding to caller goes away, by linkToDeath().
Need to unregister this callback when we throw away the vibration.

Change-Id: Ibdf0bd415a539054ac7a66f49b33a864f729c546
2011-03-24 08:49:12 +01:00
Robert Greenwalt
5635dc9313 am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
* commit '0b6d044567b9c3004eb7ed826fd593019cd24352':
  Fix adding of default route.
2011-03-22 21:39:19 -07:00
Robert Greenwalt
0b6d044567 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
edcb4f9d56 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
Mike Lockwood
9a612b545e am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
* commit '65de3c76874386a5c1ffd26690451ecdef972a9e':
  DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:37:33 -07:00
Mike Lockwood
433567b57c am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
* commit '56063c8d62d0574409a8150d580993c8d8e0f14f':
  UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:33:01 -07:00
Mike Lockwood
56063c8d62 am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
  UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:25:09 -07:00
Mike Lockwood
dd76dc0297 Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 2011-03-20 17:08:24 -07:00
Mike Lockwood
65de3c7687 DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
Bug: 4129297

Change-Id: I33963b0a667976d8100a60b27d66bfd0d57373e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-19 14:38:54 -04:00
Mike Lockwood
1c0e543638 UsbService: Handle the case where a USB accessory connects as the device is booting
Bug: 4129297

Change-Id: I8f9d085805fb598572f9b00952c3cd38cfab461b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-19 12:03:46 -04:00
Jamie Gennis
bd340c7b49 am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
  SurfaceFlinger: Fix a typo.
2011-03-18 17:36:51 -07:00
Jamie Gennis
b368f4d85d am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.
2011-03-18 17:34:27 -07:00
Jamie Gennis
38caff230d Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 2011-03-18 17:32:25 -07:00
Jamie Gennis
6912daf5fa SurfaceFlinger: Fix a typo.
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.

Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
2011-03-18 16:35:13 -07:00