22988 Commits

Author SHA1 Message Date
Costin Manolache
625de48897 am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging
2010-05-12 07:49:16 -07:00
Jean-Michel Trivi
0c73adb1de am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp

* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
  Update javadoc in android.media.AudioManager to not hide the
2010-05-12 07:49:10 -07:00
Dirk Dougherty
6d405cfcfe am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
Merge commit 'fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp

* commit 'fe08933450f4be42c9b3eac900c64f23857ecd17':
  Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
2010-05-12 07:49:00 -07:00
Jean-Michel Trivi
ea37d9b489 am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698
2010-05-12 07:48:50 -07:00
Wu-cheng Li
d8c33747af am 78624e41: Add remove method in CameraParameters class.
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp

* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
  Add remove method in CameraParameters class.
2010-05-12 07:48:41 -07:00
Eric Laurent
4f0f17d2f1 Fix issue 2678048: binder death detection in AudioFlinger is broken.
There is a bug in the way notification client list is managed when the client binder
interface dies that makes that the dead client is not removed from the list: the week
reference passed by binderDied() cannot be promoted and compared to the strong
references in the list.

The fix consists in creating a new NotificationClient class that implements the
binder DeathRecipient and holds a strong reference to the IAudioFlingerClient interface.
A new instance of this class is created for each cient and a strong reference to this
object is added to the notification client list maintained by AudioFlinger.
When binderDied() is called on this object, it is removed from the list preventing
AudioFlinger to notify this client for further io changes.

Also added code to disable LifeVibes effects when the client that has enabled the
enhancements dies.

Change-Id: Icedc4af171759e9ae9a575d82d44784b4e8267e8
2010-05-12 06:29:16 -07:00
Kenny Root
68246dcec1 ZipUtilsRO rewrite based on Dalvik Zip rewrite
Change the way zip archives are handled.  This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.

We now do the classic scavenger hunt for the End Of Central Directory
magic on a buffer of data read from the file, instead of a memory-mapped
section.  We use what we find to create a map that covers the Central
Directory only.

If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it.

This is based on Change I745fb15abb in the dalvik tree. Both
implementations share a common ancestry, but the cost of unifying them
outweighs the benefits of wrapping C calls.

Change-Id: Iddacb50fe913917c2845708a530872d65fdbe620
2010-05-12 05:07:48 -07:00
Marc Capdevielle
ade63a0555 New test in FrameworkTest for the VelocityTracker class 2010-05-12 09:31:55 +02:00
Johan Alfven
6c3da7fbc2 Corrected debug message in WindowManager
When WindowManager reports "Key dispatching timed out"
it prints out information about the window state that was
present at the time the key was sent to that window.
There is a minor error in the class representing the
recorded window state so that the currently focused window
is printed instead of the recorded focused window.

Change-Id: I29a5471ef725e30f812ffd57fd4597ce81c0c7f2
2010-05-12 09:01:56 +02:00
Scott Main
18dc51d413 Merge "docs: fix broken anchor names" into froyo 2010-05-11 20:13:26 -07:00
Dirk Dougherty
0d1b0814be Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
Change-Id: I7abf541316f2796079cf646a3294db535fcaaa8a
2010-05-11 20:07:32 -07:00
Dirk Dougherty
4d5275e723 Merge "Doc change: update diff report 7-> 8" into froyo 2010-05-11 19:53:04 -07:00
Dirk Dougherty
a25528fc62 Doc change: update diff report 7-> 8
Change-Id: I376622ae9afff8effc1153129eb68a8f53436ad4
2010-05-11 19:35:15 -07:00
Scott Main
9280c34465 docs: fix broken anchor names
Change-Id: I9eafcddf55c56a95ac3ee631ae9216ff544759fc
2010-05-11 19:29:00 -07:00
Scott Main
827a50dda4 Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo 2010-05-11 19:25:19 -07:00
Brett Chabot
b4c9a8f664 Merge "Fix imf tests." into froyo 2010-05-11 19:17:04 -07:00
Scott Main
77ca256d95 docs: remove the dashboard from the sidenav for the offline docs
Change-Id: I65c9d8897d6eef9ee8e09daab239b20ed7551cd7
2010-05-11 19:05:04 -07:00
Brett Chabot
e9d0b2962d Fix imf tests.
- fix hard keyboard detection logic
- use FLAG_ACTIVITY_MULTIPLE_TASK to force test activities to start with IME

Bugs 2677320, 2677355

Change-Id: I1b943ee17fddcae5087faefa9fa5603dd3f18ec1
2010-05-11 18:51:16 -07:00
Scott Main
bb129dc57b docs: make Notifying the User an expandable list
Change-Id: I287a7e15a4461defa96903c7e922b8640c0bb257
2010-05-11 18:00:44 -07:00
Scott Main
a225e3b1cd docs: add quickview box with "see also" links for some articles
Change-Id: I2d5e83e691e61731b30b4741d02e096d5ef76fc2
2010-05-11 17:47:40 -07:00
Scott Main
6bc3304b74 Merge "docs: remove allowBackup attribute from documentation" into froyo 2010-05-11 15:25:38 -07:00
Samuel Holmberg
ce2a97aeb8 Preserve '+' in phone numbers imported from SIM.
Contacts with phonenumbers beginning with '+' lose the '+' in the
phonebook when imported from SIM.

This was only noticable on ADN-records with unknown NPI-values which
isn't very usual.

Change-Id: I181249759ae3d4181dd3cf627c7a588394b80419
2010-05-11 15:21:43 -07:00
Xavier Ducrohet
b1235a57a0 Merge "Hide two audio focus methods." into froyo 2010-05-11 14:48:48 -07:00
Marco Nelissen
836b2d75ef Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 2010-05-11 14:36:16 -07:00
Xavier Ducrohet
5f53f0883a Hide two audio focus methods.
Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa
2010-05-11 14:28:38 -07:00
Dianne Hackborn
037cd3413a Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 2010-05-11 14:26:43 -07:00
Sean Foy
26abeae75b Remove ProximityAlerts Receiver when last ProximityAlert expires.
Remove the ProximityAlerts update Receiver when the last ProximityAlert expires.
Fixes issue 6900.

Change-Id: Ida1970c084e71df47b204c64986a065cb75d0c13
2010-05-11 14:24:26 -07:00
Scott Main
5cdf5fdcba docs: add document about app install location
Change-Id: Ife7d79ce8374f3435f4850cbf97d163e69bf8d26
2010-05-11 14:21:53 -07:00
Dianne Hackborn
6f86c0e64b Fix issue #2676378: Activity Manager Crash on FRF40
D'oh!

Change-Id: If1b43ff5f230f9bf0de0887deb1b25dcf6aa6e66
2010-05-11 14:20:52 -07:00
Dirk Dougherty
8acb68e9aa Merge "Doc Change: Docs for NDK r4." into froyo 2010-05-11 14:20:24 -07:00
Scott Main
c80b95a85a Merge "docs: announce froyo and update IO message" into froyo 2010-05-11 14:04:49 -07:00
Dirk Dougherty
d6a04186b6 Doc Change: Docs for NDK r4.
Change-Id: Ib535324eb884d4be2c7bbba2d74cc9043acc3475
2010-05-11 13:29:58 -07:00
Mike Lockwood
e1d7dca608 Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 2010-05-11 13:26:25 -07:00
James Dong
2cd841d485 Added initial validation on video/audio encoding parameters before/at start()
Change-Id: I1a40dd247202f70e3e5429d74533d349b88f1d54
2010-05-11 13:10:02 -07:00
Marco Nelissen
33f49c8377 Don't clear the _data column in the audio_meta table, since it isn't
needed, and causes a sqlite constraint exception.
Bug 2671792.

Change-Id: Ie6e5d0369c3750739fa155e651be4d87c016a41f
2010-05-11 13:09:06 -07:00
Mike Lockwood
f19a785e15 LocationManagerService: Call updateNetworkState on providers that are disabled.
Fixes a problem with Network Location not working after SetupWizard until the
network state changes.

Change-Id: Ief81b76beb5cc90b2ca7d8aa2d4c99221898f01d
BUG: 2671347

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-11 15:35:09 -04:00
Jamie Gennis
25c2af99bf Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken 2010-05-11 12:25:31 -07:00
Andreas Huber
e0dc80f878 Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo 2010-05-11 12:21:14 -07:00
Andreas Huber
d6ad7c85fa Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo 2010-05-11 12:20:55 -07:00
Dianne Hackborn
80131e4b9b Merge "Corrected repeat count for key repeat in input device." 2010-05-11 12:07:32 -07:00
Costin Manolache
e2055fe425 Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-11 11:42:58 -07:00
Jean-Michel Trivi
3e90c76c12 Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo 2010-05-11 11:40:21 -07:00
Dirk Dougherty
fe08933450 Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo 2010-05-11 11:33:13 -07:00
Joe Malin
5e17347a27 Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
Change-Id: I0da7ebb8040013611ba9269bc303e4b8197033aa
2010-05-11 11:25:23 -07:00
Jean-Michel Trivi
46b3a1808a Update javadoc in android.media.AudioManager to not hide the
registerAudioFocusListener() methods.

Change-Id: I8df37bd89df6f492aeb70fa636200552140578f9
2010-05-11 11:22:54 -07:00
Andreas Huber
e67c1607cc Support for customizable socket-read timeouts through the HTTP response.
Specify a response header of "X-SocketTimeout: 15" to override the default timeout
of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the
timeout altogether.

Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db
related-to-bug: 2675721
2010-05-11 11:10:21 -07:00
Scott Main
0d3401d81b docs: announce froyo and update IO message
Change-Id: I07a071c99eaf0a03e7dd9d4e0c5969b47e86ab08
2010-05-11 10:49:59 -07:00
James Dong
b5e742397d Output streamable MP4 file during MP4 file recording
When the reserved moov box space is not big enough,
fall back to non-streamable MP4 file.

Change-Id: I93382d037d657a3f3fe2af31e4ea26e1898b4d95
2010-05-11 10:36:43 -07:00
Keith Ito
8528fcb199 am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken

* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
  Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:24:03 -07:00
Nicolas Roard
2f68be5417 am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken

* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
  Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00