26189 Commits

Author SHA1 Message Date
Chia-chi Yeh
3238302b18 Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread 2010-06-22 17:20:44 -07:00
Adam Powell
110486f932 Fix a bug where requestDisallowInterceptTouchEvent does not get called
when scrolling is resumed after stopping a fling.

Change-Id: I6796c5082cb81b3116de5baf1f27fe3addb40d00
2010-06-22 17:14:44 -07:00
Eric Laurent
619346f902 Added support for audio sessions in MediaPlayer and AudioTrack.
Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks.

Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
2010-06-22 17:14:04 -07:00
Eric Laurent
7d329785f3 am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
Merge commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db' into gingerbread-plus-aosp

* commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.
2010-06-22 17:11:54 -07:00
Eric Laurent
d1559d6b2d Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread 2010-06-22 17:08:55 -07:00
Chia-chi Yeh
97d61f7518 media: add AudioRecord::getMinFrameCount().
Change-Id: I952071ab10aa49aa96b727d157b68470d69fff3d
2010-06-23 08:01:04 +08:00
Eric Laurent
3c652ca5a5 Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.
Use setParameters() API to indicate to audio HAL that we are restarting the media server after a crash.
The use made by audio HAL implementation of this indication is platform specific.

Change-Id: I085b174fa1474575da0e4d295921079b6b68efb8
2010-06-22 16:53:47 -07:00
Vasu Nori
46b1e46cc2 Merge "fix broken current.xml" 2010-06-22 16:05:11 -07:00
Vasu Nori
f49922ed49 fix broken current.xml
Change-Id: I73efb8882596ffa19a49849ead444870a7c28378
2010-06-22 16:01:30 -07:00
Vasu Nori
fde7306b12 Merge "for memory databases, don't set journal_mode and don't allow WAL" 2010-06-22 15:53:18 -07:00
Vasu Nori
a98cb2632d for memory databases, don't set journal_mode and don't allow WAL
WAL and journal_mode are not applicable to memory databases

Change-Id: I06fcbfe9ce76878c57d1542efe9cc060598262ff
2010-06-22 15:52:12 -07:00
Elliott Slaughter
5dc0c8253b Add setXSSAuditorEnabled support in WebSettings.
Change-Id: I6f74589b28960b91093acf8219a55e98f93b1881
2010-06-22 14:56:54 -07:00
James Dong
9666d3c0e7 am 750600a1: Merge "Single track optimization" into gingerbread
Merge commit '750600a187f699ead85ef026ab33dc2bdd1d2c29' into gingerbread-plus-aosp

* commit '750600a187f699ead85ef026ab33dc2bdd1d2c29':
  Single track optimization
2010-06-22 14:29:42 -07:00
James Dong
750600a187 Merge "Single track optimization" into gingerbread 2010-06-22 14:28:15 -07:00
John Wang
75d41c96a7 Merge "Create CallManager class." 2010-06-22 13:56:44 -07:00
Mike Lockwood
d402d695c6 Merge "MTP: Use a fd instead of a file path in file transfer ioctls." 2010-06-22 13:40:09 -07:00
Mike Lockwood
fc2c02ef90 Merge "mtptest: Add option to specify storage path at the command line." 2010-06-22 13:39:36 -07:00
Mike Lockwood
42dbfa51ae MTP: Use a fd instead of a file path in file transfer ioctls.
This restricts the driver to the client's permissions when copying files
to avoid potential security problems.

Change-Id: I9b3151168d334fe4374875804d4ba82bef44db3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-22 16:38:01 -04:00
Mike Lockwood
dff6e6e378 mtptest: Add option to specify storage path at the command line.
Change-Id: Iac8a34ffb8177018a9164b3f2f97b2e84c3d8f1c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-22 16:37:56 -04:00
Romain Guy
61ebc86c0a Merge "Fix simulator build again." 2010-06-22 13:30:14 -07:00
Romain Guy
3e168335b3 Fix simulator build again.
Change-Id: Ifd204d64eaa4c356422e3363ec0a6e6aa61c52dc
2010-06-22 13:29:14 -07:00
John Wang
0dfdc06005 Create CallManager class.
Initial check-in to support multiple call channels.

Change-Id: I7c5147c57077d024bacd4f68938d249219eb0011
2010-06-22 13:14:02 -07:00
Vasu Nori
7d977de3d0 Merge "when corruption occurs, not clsing the db is casuing stack overflow" 2010-06-22 13:13:16 -07:00
Romain Guy
af002cf12c Merge "Fix the simulator build." 2010-06-22 13:12:44 -07:00
Romain Guy
85bf02fc16 Fix the simulator build.
Change-Id: Ie404f7c2c308f0657f273af19a56e8c039b61898
2010-06-22 13:11:24 -07:00
Vasu Nori
5666170c1e when corruption occurs, not clsing the db is casuing stack overflow
due to a bug in DefaultDatabaseErrorHandler, if the corruption is
so bad that the list of attached databases can't even be retrieved,
then database is not closed in DefaultDatabaseErrorHandler,
this causes the corrupted file to remain on disk.
this causes corruption detection to occur forever until the stack
overflows.

Change-Id: I9896bee220231cbde0b1620ad0a617420424967c
2010-06-22 12:22:31 -07:00
James Dong
b54a917842 Single track optimization
We don't need to do interleave when the total number of tracks to be recorded is one.
Metadata-wise, we only need to have one chunk in chunk offset table, and a
single entry in the stsc table.

Change-Id: I46f0e4b3860620311e7a91b68a9067acaa137bb2
2010-06-22 11:27:37 -07:00
Dianne Hackborn
e3e2883f22 am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread
Merge commit 'e24a60aa4670fb835772b23ff665bb368fa65e30' into gingerbread-plus-aosp

* commit 'e24a60aa4670fb835772b23ff665bb368fa65e30':
  First stab at attaching native event dispatching.
2010-06-22 11:26:02 -07:00
Dirk Dougherty
ca36e9eebe am 7c1a2dfa: am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Merge commit '7c1a2dfa8930fd12bb8791fc02bace751917bdee' into gingerbread-plus-aosp

* commit '7c1a2dfa8930fd12bb8791fc02bace751917bdee':
  Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:25:59 -07:00
Dirk Dougherty
dd1880ee5b am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Merge commit '17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp

* commit '17ae646586663c59ad360bb72884beded7475687':
  Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:24:01 -07:00
Dianne Hackborn
e24a60aa46 Merge "First stab at attaching native event dispatching." into gingerbread 2010-06-22 11:22:37 -07:00
Dirk Dougherty
7c1a2dfa89 am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Merge commit '17ae646586663c59ad360bb72884beded7475687' into gingerbread

* commit '17ae646586663c59ad360bb72884beded7475687':
  Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:22:12 -07:00
Dianne Hackborn
a95e4cb62f First stab at attaching native event dispatching.
Provides the basic infrastructure for a
NativeActivity's native code to get an object representing
its event stream that can be used to read input events.

Still work to do, probably some API changes, and reasonable
default key handling (so that for example back will still
work).

Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e
2010-06-22 11:21:50 -07:00
Dirk Dougherty
17ae646586 Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo 2010-06-22 11:13:48 -07:00
Daniel Sandler
57b5326561 am ef730e6e: Merge "Fix javadocs." into gingerbread
Merge commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c' into gingerbread-plus-aosp

* commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c':
  Fix javadocs.
2010-06-22 11:10:18 -07:00
Daniel Sandler
ef730e6ece Merge "Fix javadocs." into gingerbread 2010-06-22 11:08:40 -07:00
Daniel Sandler
8091ca5015 Fix javadocs.
Change-Id: Ic37c16625ddd0175cc048dd2b22bc75c6962d43d
2010-06-22 13:58:46 -04:00
Grace Kloba
ef7fa7bc66 Merge "Add a WebSettings to control whether WebView will use some perf trick, e.g. pause updating the picture, during panning and zooming transition." 2010-06-22 10:39:18 -07:00
Andreas Huber
6adf0c4de6 am ef1c48d6: Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
Merge commit 'ef1c48d6a976f56bf7f7a41a5b2e8725af988362' into gingerbread-plus-aosp

* commit 'ef1c48d6a976f56bf7f7a41a5b2e8725af988362':
  Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
2010-06-22 10:12:32 -07:00
Andreas Huber
235073a549 am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
Merge commit '8a42f8817de0fc178059bfb1288732d2de65259d' into gingerbread-plus-aosp

* commit '8a42f8817de0fc178059bfb1288732d2de65259d':
  Make sure sine: is supported again in stagefright commandline tool.
2010-06-22 10:12:29 -07:00
Andreas Huber
ef1c48d6a9 Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread 2010-06-22 10:11:15 -07:00
Andreas Huber
8a42f8817d Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread 2010-06-22 10:11:04 -07:00
James Dong
0696768374 am e5671bfe: Merge "Audio/video sync during recording (second part)" into gingerbread
Merge commit 'e5671bfe51aeaac823cd94f8e04f01e37b4c2cd6' into gingerbread-plus-aosp

* commit 'e5671bfe51aeaac823cd94f8e04f01e37b4c2cd6':
  Audio/video sync during recording (second part)
2010-06-22 10:06:37 -07:00
James Dong
e5671bfe51 Merge "Audio/video sync during recording (second part)" into gingerbread 2010-06-22 10:05:02 -07:00
Andreas Huber
a486754053 Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
Change-Id: I7d022ac494e1cecdd7f656806b7ed45979c02840
2010-06-22 09:54:58 -07:00
Daniel Sandler
71764c4ce5 am 613dde4a: Revised "immersive mode" API.
Merge commit '613dde4aa651e11dac3db859723cc6faf8fc0a82' into gingerbread-plus-aosp

* commit '613dde4aa651e11dac3db859723cc6faf8fc0a82':
  Revised "immersive mode" API.
2010-06-22 09:36:07 -07:00
Daniel Sandler
613dde4aa6 Revised "immersive mode" API.
No longer a window bit, FLAG_IMMERSIVE is now set on
ActivityInfo.flags and in the Activity's manifest as
android:immersive="true" (ActivityInfo).

[An "immersive" activity is one that wishes to avoid being
paused by full-screen notifications (like an incoming call).
An activity that sets FLAG_IMMERSIVE/android:immersive is
sending a signal to the notification manager, status bar,
etc. that they should try to find some other way to get the
user's attention in high-priority situations.]

[Originally: change Ie290c2e.]

Change-Id: I967bb10b930b8f0772b10f81f2957a03fa3f1736
2010-06-22 12:30:12 -04:00
Mike Lockwood
dae19d7c00 am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
Merge commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d' into gingerbread-plus-aosp

* commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d':
  GPS: remove GpsEventThread from GpsLocationProvider
2010-06-22 06:45:03 -07:00
Mike Lockwood
aaf39f8406 Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread 2010-06-22 06:44:03 -07:00
Mike Lockwood
f602d362ba GPS: remove GpsEventThread from GpsLocationProvider
Rather than polling for events from the native code in an event thread,
we now require the GPS HAL libraries to call our callbacks from a thread
that is registered with the JVM to call directly into Java.
This eliminates a thread from our code and removes one step in the chain
of message passing from the GPS to the Location Manager client.

Change-Id: I2745a157690310ba9a699a8369f54a7366c6b1ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-22 09:26:41 -04:00