Eric Laurent
79ec54789d
am 7d329785: am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
...
Merge commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f'
* commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f':
Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.
2010-06-23 12:40:28 -07:00
Romain Guy
bb9524b6bd
Add implementations for clipRect(), save() and restore().
...
The current implementation of clipRect() does not apply local transformations
before setting the new clip.
Change-Id: I5997871bb638dfcd1a8ef96354846af52427e445
2010-06-23 12:36:03 -07:00
Mike Lockwood
8900c32986
andriod.location.Criteria: Simplify new location criteria APIs a bit.
...
Remove ACCURACY_BEST and only use ACCURACY_MEDIUM for horizontal accuracy.
Remove accuracy priority support, since it be difficult to implement in some cases.
Change-Id: I785a781f8d8f3bf3be6693ad71d077b6eb280c31
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-23 14:34:03 -04:00
Andreas Huber
fb41d59595
Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
...
Change-Id: I863651619f84b2b66e9a926ce1fef8ce6a53a42d
related-to-bug: 2639116
2010-06-23 11:33:43 -07:00
Ray Chen
1ba38b600e
Fix 2655246 file descriptor leak when accessing thumbnails
...
http://b/2655246
Moved from kraken to master (https://android-git.corp.google.com/g/#change,51691 )
Change-Id: I7d0cffd745311d073415d597eb141e26fe1edcce
2010-06-23 11:32:40 -07:00
Andreas Huber
b64af9a221
Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
...
Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352
related-to-bug: 2667479
2010-06-23 11:11:58 -07:00
Gilles Debunne
03f0292744
New XmlDocumentProvider class.
...
Minor changes in the Adapters.java helper class.
Extracts data out of a XML document using an XPath-like syntax.
Change-Id: I0617b0783f11c86118b42cd8485d54440810c805
2010-06-23 10:43:00 -07:00
James Dong
84d000e3c4
am 9666d3c0: am 750600a1: Merge "Single track optimization" into gingerbread
...
Merge commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698'
* commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698':
Single track optimization
2010-06-23 10:32:53 -07:00
Dianne Hackborn
320742b15a
am e3e2883f: am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread
...
Merge commit 'e3e2883f2232007174ead562610eb01201890d9b'
* commit 'e3e2883f2232007174ead562610eb01201890d9b':
First stab at attaching native event dispatching.
2010-06-23 10:32:25 -07:00
Dirk Dougherty
a58a7aecf4
am ca36e9ee: am 7c1a2dfa: am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
...
Merge commit 'ca36e9eebe252e04dbadeb07282c1eba8d9f080b'
* commit 'ca36e9eebe252e04dbadeb07282c1eba8d9f080b':
Doc change: Fix description of certificate matching requirement for app updates.
2010-06-23 10:32:21 -07:00
Daniel Sandler
c4c6635d1a
am 57b53265: am ef730e6e: Merge "Fix javadocs." into gingerbread
...
Merge commit '57b5326561b6edb22b09016985b41b7cdb2156c0'
* commit '57b5326561b6edb22b09016985b41b7cdb2156c0':
Fix javadocs.
2010-06-23 10:32:02 -07:00
Andreas Huber
9b1c2a50d2
am 6adf0c4d: 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 '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296'
* commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296':
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-23 10:31:50 -07:00
Andreas Huber
c450cd0db6
am 235073a5: am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
...
Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b'
* commit '235073a549ec664caea93e0ccded95e4a6819b6b':
Make sure sine: is supported again in stagefright commandline tool.
2010-06-23 10:31:43 -07:00
James Dong
fc667dabcf
am 06967683: am e5671bfe: Merge "Audio/video sync during recording (second part)" into gingerbread
...
Merge commit '0696768374567afa4fe58c2ef0af948b72e83e5d'
* commit '0696768374567afa4fe58c2ef0af948b72e83e5d':
Audio/video sync during recording (second part)
2010-06-23 10:31:36 -07:00
Daniel Sandler
6c55b8b143
am 71764c4c: am 613dde4a: Revised "immersive mode" API.
...
Merge commit '71764c4ce5b248a79542238b171a783e82e0fe37'
* commit '71764c4ce5b248a79542238b171a783e82e0fe37':
Revised "immersive mode" API.
2010-06-23 10:31:21 -07:00
Mike Lockwood
b09448e0a8
am dae19d7c: am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
...
Merge commit 'dae19d7c00455e500cc9731071557ea91f162a7d'
* commit 'dae19d7c00455e500cc9731071557ea91f162a7d':
GPS: remove GpsEventThread from GpsLocationProvider
2010-06-23 10:31:00 -07:00
Jack Palevich
819008233e
am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
...
Merge commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c'
* commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c':
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
2010-06-23 10:30:34 -07:00
Mathias Agopian
3b224f931e
am a4f98094: am 07ccf5ad: remove unused YUV formats
...
Merge commit 'a4f980948e112cfdcc7051e12e29c71b78383a6f'
* commit 'a4f980948e112cfdcc7051e12e29c71b78383a6f':
remove unused YUV formats
2010-06-23 10:30:16 -07:00
James Dong
6bab6cebdc
am d076b590: am 875500b4: Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore\'s code" into gingerbread
...
Merge commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b'
* commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b':
AmrInputStream refresh: eliminate the dependency upon OpenCore's code
2010-06-23 10:30:07 -07:00
Adam Powell
bc337d2f67
am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
...
Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp
* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
Fix a bug where requestDisallowInterceptTouchEvent does not get called
2010-06-23 10:28:00 -07:00
Adam Powell
73ccafb5b8
Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
2010-06-23 10:26:44 -07:00
Brad Fitzpatrick
fc94e89a7f
am efcf68aa: am ef8f96a7: Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread
...
Merge commit 'efcf68aa1fd7fcfd52cf3d2837ed8db8e797194b'
* commit 'efcf68aa1fd7fcfd52cf3d2837ed8db8e797194b':
Start of work on passing around StrictMode policy over Binder calls.
2010-06-23 10:18:18 -07:00
Mathias Agopian
f3a8f74f7b
am b9fd188a: am d91ac98a: fix [2785833] valgrind error in android::Layer::requestBuffer
...
Merge commit 'b9fd188a0b1cd71e38c03a7bb4a4688eedf83667'
* commit 'b9fd188a0b1cd71e38c03a7bb4a4688eedf83667':
fix [2785833] valgrind error in android::Layer::requestBuffer
2010-06-23 10:18:06 -07:00
Mathias Agopian
37d9a6b7c2
am cefb8858: am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
...
Merge commit 'cefb88587443323d147e687ff78eae9195eb584c'
* commit 'cefb88587443323d147e687ff78eae9195eb584c':
Added support for the GL_TEXTURE_EXTERNAL target
2010-06-23 10:17:56 -07:00
Mathias Agopian
dc79f0f2da
am bf900939: am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread
...
Merge commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6'
* commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6':
Improve SensorManager documentation
2010-06-23 10:17:42 -07:00
Jeff Brown
e981c883d5
am b1efc3f6: am 7fbdc84e: More native input event dispatching.
...
Merge commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe'
* commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe':
More native input event dispatching.
2010-06-23 10:17:22 -07:00
Scott Main
0c837a2e35
am 9fe2c4e2: am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
...
Merge commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e' into gingerbread-plus-aosp
* commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e':
docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:13:43 -07:00
Scott Main
9fe2c4e2b8
am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
...
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into gingerbread
* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
docs: update backup dev guide with Android Backup Service registration info
2010-06-23 10:07:37 -07:00
Scott Main
753e56090e
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
2010-06-23 09:57:46 -07:00
Steve Block
7fb6a8b345
Merge "Adds a Geolocation permission handler to the WebRuntime"
2010-06-23 07:45:51 -07:00
Steve Block
1218fcec07
Adds a Geolocation permission handler to the WebRuntime
...
This always allows or denies permission, depending upon the app's permissions
Bug: 2766920
Change-Id: If8f617560c4a10f242efae9accc0653ffe693a0a
2010-06-23 15:42:39 +01:00
Kenny Root
24ca4545f3
Check for spanned before computing tab stops
...
Don't try to check for tab stop spans in non-Spanned text input.
Change-Id: I54d69c8e0246f5a38d0713a89b8b455a478285f0
2010-06-22 23:55:15 -07:00
Scott Main
964384962d
docs: update backup dev guide with Android Backup Service registration info
...
Change-Id: I16696abbd517a5a740ff641ca0b17ffafbcf4993
2010-06-22 19:26:16 -07:00
Vasu Nori
8d1110383d
if attach database sql statement is exec'ed, disable write WAL
...
an app can execute 'attach database..' statement anytime after WAL is
enabled. since WAL doesn't work with atatched databases,
disable WAL whenever the caller executes 'attach database'
sql statement.
Change-Id: I77dfcb744b59476c357d44296c14d63455985a7b
2010-06-22 18:34:21 -07:00
Eric Laurent
845f541454
am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
...
Merge commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d' into gingerbread-plus-aosp
* commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d':
Added support for audio sessions in MediaPlayer and AudioTrack.
2010-06-22 18:32:17 -07:00
Eric Laurent
2c2ce8e53f
Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
2010-06-22 18:29:57 -07:00
Jason Sams
433517b016
Merge "Fix 32&24 ->16 bit bitmap uploads."
2010-06-22 17:46:18 -07:00
Jason Sams
0ebd5690b8
Fix 32&24 ->16 bit bitmap uploads.
...
Change-Id: If8c52dd8ff34393c2908516e702a2d5daeb7bbb3
2010-06-22 17:45:34 -07:00
Jason Sams
7493c52871
Merge "Re-enable optimization for detecting nop state changes in fragment and vertex programs."
2010-06-22 17:23:47 -07:00
Jason Sams
7c1f4c38a2
Re-enable optimization for detecting nop state changes in fragment
...
and vertex programs.
Change-Id: Ic5b9ecf564d121d7a00a1eed92afb4c4783ce8bc
2010-06-22 17:22:13 -07:00
Chia-chi Yeh
da9269af5e
am 3238302b: Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
...
Merge commit '3238302b1819bb384b79402c0106a2bdfc3f35d0' into gingerbread-plus-aosp
* commit '3238302b1819bb384b79402c0106a2bdfc3f35d0':
media: add AudioRecord::getMinFrameCount().
2010-06-22 17:22:10 -07:00
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