5421 Commits

Author SHA1 Message Date
Dan Morrill
75c664582c am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 12:26:16 -07:00
Dan Morrill
8325c3a891 Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change
since file was renamed, making cherry-pick impossible.

Change-Id: Idc802af57fb9926a69ed52d4e776ef57d8b647c6
2011-05-02 14:06:06 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes.
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
2011-05-02 11:17:30 -07:00
Eric Laurent
969357e31c am 223995dc: Fix issue 4335692: HDMI media volume
* commit '223995dcf28aca2399258951a59559a7ae318ceb':
  Fix issue 4335692: HDMI media volume
2011-04-26 00:19:34 -07:00
Eric Laurent
223995dcf2 Fix issue 4335692: HDMI media volume
Forced music stream volume to max when not muted and output device is HDMI.

Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13
2011-04-25 13:34:51 -07:00
Wink Saville
64c42cae44 Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
2011-04-18 14:55:10 -07:00
Dianne Hackborn
9a03a73a44 am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
* commit 'f6f87c985989603139b31df663f9f9a90543cacc':
  Fix issue #4291805: Tap Fish crashes on launch
2011-04-14 15:27:32 -07:00
Dianne Hackborn
f6f87c9859 Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1 2011-04-14 15:10:31 -07:00
Dianne Hackborn
52b0ce0fe3 Fix issue #4291805: Tap Fish crashes on launch
The activity manager got a little too aggressive about argument validation.

Change-Id: I3cca0cd3135b98e5c50d26db778ec4ec28a47ec1
2011-04-14 13:09:32 -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
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -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
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
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
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
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
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
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
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
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
James Dong
970bad6775 am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
  Fix missing AOSP copyright headers for more files
2011-03-17 17:55:48 -07:00
James Dong
199d1c131d Fix missing AOSP copyright headers for more files
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
  because these two files were moved from other places to the current location,
  and were actually created in 2010.

bug - 4119349

Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
2011-03-17 14:43:12 -07:00
Paul Milovanov
eca7ff02fb am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:26:32 -07:00
Paul Milovanov
87f50f19ee Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 2011-03-17 10:23:48 -07:00
Jeff Brown
244eb34a67 am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
* commit 'd98f8aff731123eef1f0a8bc8bfc917647d5ac3a':
  Fix dangling pointer when device closed just after opening.
2011-03-17 01:00:36 -07:00
Jeff Brown
d98f8aff73 Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1 2011-03-17 00:59:08 -07:00
Jeff Brown
8e9d4431d6 Fix dangling pointer when device closed just after opening.
Bug: 4088239
Change-Id: I210b918370357560a5ace8ea8dd7601255487e88
2011-03-17 00:36:35 -07:00
Mathias Agopian
25594e1984 am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
* commit 'f40e638ec62cd9e1a1851809b7c8bf5e4187fad2':
  fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
2011-03-17 00:10:10 -07:00
Mathias Agopian
f40e638ec6 fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
a memory corruption happned when the buffer pool was resized
(like when playing a video or using camera) and there was
no current active buffer. In this case, the faulty code
would index into an array at position -1 which corrupted
24 bytes of data.

also improved region validation code (ifdef'ed out by default)

Bug: 4093196
Change-Id: I915c581d131148959d720e00e3892e9186ab733d
2011-03-17 00:04:42 -07:00
Paul Milovanov
a57db345d3 PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
In PackageManagerService, intent with ACTION_PACKAGE_FIRST_LAUNCH was
being sent to wrong package. It was being sent to the installed
package with installer package in the URI, whereas it should be sent
to installer package with installed package in the URI.
Comment in Intent.java:1417 seems to support that intent with this
action should be sent to the installer package, not installed.

Bug: 3426299
Change-Id: Iadec4ae7a1af6bab434716f8fcdb7d0b099d1ee1
2011-03-16 23:12:31 -07:00
Adam Cohen
afcb65c2fd am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
* commit '296c1616bad5a075cf64c2ba025b0cfd6bb3816d':
  Catching all Exceptions when calling through to RemoteViewsFactory
2011-03-16 18:03:23 -07:00
Adam Cohen
296c1616ba Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1 2011-03-16 18:02:08 -07:00
Adam Cohen
c2be22cf20 Catching all Exceptions when calling through to RemoteViewsFactory
Change-Id: Ib20c880bb7626565541ab4697317fcfaa2e6b5b7
2011-03-16 16:33:53 -07:00
Eric Laurent
a6c3ace327 am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
* commit '3913c131c61288c5b4eedb063d9eb6b6204d2a1f':
  Improvement for issue 3489986: BT SCO volume
2011-03-15 23:44:43 -07:00
Eric Laurent
3913c131c6 Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 2011-03-15 19:17:53 -07:00
Eric Laurent
257b2d0b80 Improvement for issue 3489986: BT SCO volume
This change makes sure that the VOICE_CALL stream volume tracks
the BLUETOOTH_SCO stream volume when SCO audio is enabled.
The down link audio volume now reflects what is being displayed
when pressing volume hard keys on the device while in a video chat
with a BT SCO headset.

Volume settings on the headset and the device are still independent as
we do not support handsfree profile yet.

Change-Id: Ie0d2714730ea359b9318b9cbe6f0b2557ef0f976
2011-03-15 14:26:03 -07:00
satok
f057524db6 am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'b02b8369c6549417561e2ae1467b615645b5d04c':
  Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:47:11 -07:00
satok
b02b8369c6 Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 2011-03-14 22:44:23 -07:00
Mike Lockwood
0958fb1068 am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
* commit '221830b93d6f35bcf20db2d34978392b43f44221':
  Add support for USB accessory serial numbers
2011-03-14 17:41:22 -07:00
Mike Lockwood
015b1ecaec Add support for USB accessory serial numbers
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 20:10:47 -04:00
Wink Saville
c15cf6353e 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
satok
b548a3cfa0 Remove a workaround for the data inconsistency of SystemProperties
Bug: 3473532
Reverting: Ie3f5b484b5574e10a4

Depends on Bug: 3511230
This must be fixed before submitting this CL.

Change-Id: I435a294a818bec5675f0ada00d81c1b3e37d1dce
2011-03-14 12:38:34 -07:00
Wink Saville
9d7d62801d Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
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
Irfan Sheriff
e21110f8b1 Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00
Mike Lockwood
bce6f8f249 Add a dialog to ask user to start an application for a USB device or accessory
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity

Bug: 4074719

Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-13 19:18:08 -04:00