OSDN Git Service
James Dong [Fri, 30 Jul 2010 21:52:05 +0000 (14:52 -0700)]
am
f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Merge commit '
f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp
* commit '
f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
Jeff Brown [Fri, 30 Jul 2010 21:49:43 +0000 (14:49 -0700)]
am
00e5c613: Merge "Improve thread safety of input mappers." into gingerbread
Merge commit '
00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp
* commit '
00e5c61366d3d3d62c259277823ea15a14f68ad4':
Improve thread safety of input mappers.
James Dong [Fri, 30 Jul 2010 21:49:23 +0000 (14:49 -0700)]
Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Jeff Brown [Fri, 30 Jul 2010 21:48:25 +0000 (14:48 -0700)]
Merge "Improve thread safety of input mappers." into gingerbread
Jeff Brown [Fri, 30 Jul 2010 01:18:33 +0000 (18:18 -0700)]
Improve thread safety of input mappers.
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.
Bug:
2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
James Dong [Fri, 30 Jul 2010 21:30:31 +0000 (14:30 -0700)]
am
d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit '
d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp
* commit '
d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
Lower the lower bound for max file duration check
James Dong [Fri, 30 Jul 2010 21:28:26 +0000 (14:28 -0700)]
Merge "Lower the lower bound for max file duration check" into gingerbread
Xia Wang [Fri, 30 Jul 2010 20:46:24 +0000 (13:46 -0700)]
am
131ce67d: Merge "DO NOT MERGE" into gingerbread
Merge commit '
131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp
* commit '
131ce67d276416e3cb23a5e31121fdff1a8bf290':
DO NOT MERGE
Xia Wang [Fri, 30 Jul 2010 20:44:23 +0000 (13:44 -0700)]
Merge "DO NOT MERGE" into gingerbread
Andreas Huber [Fri, 30 Jul 2010 19:18:58 +0000 (12:18 -0700)]
am
432c5b6c: am
7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '
432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp
* commit '
432c5b6c1d4181194cb82a14107b6d10105231a9':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Andreas Huber [Fri, 30 Jul 2010 19:15:02 +0000 (12:15 -0700)]
am
7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '
7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread
* commit '
7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Jean-Baptiste Queru [Fri, 30 Jul 2010 19:13:43 +0000 (12:13 -0700)]
am
154a3200: resolved conflicts for merge of
27eecb70 to gingerbread
Merge commit '
154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp
* commit '
154a320069a316491c25b716f2aeea8c51a758e8':
fix inaccurate copyrights
Jean-Baptiste Queru [Fri, 30 Jul 2010 19:08:31 +0000 (12:08 -0700)]
resolved conflicts for merge of
27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:58:25 +0000 (11:58 -0700)]
am
0f0dd448: Merge "Fix a bug that prevented the creation of EGL shared contexts."
Merge commit '
0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp
* commit '
0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
Fix a bug that prevented the creation of EGL shared contexts.
Gilles Debunne [Fri, 30 Jul 2010 18:56:36 +0000 (11:56 -0700)]
am
4609b0a8: am
3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '
4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp
* commit '
4609b0a8fcfbed9b893301232dfa3b70bb30e4e2':
Fixes regarding densities in "Providing Resources" documentation page.
Gilles Debunne [Fri, 30 Jul 2010 18:56:24 +0000 (11:56 -0700)]
am
628be513: am
83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '
628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp
* commit '
628be513e67ce6c61884b1baaf0379abfc56100b':
Fixed doc typos in HeterogeneousExpandableList.java.
Gilles Debunne [Fri, 30 Jul 2010 18:53:21 +0000 (11:53 -0700)]
am
3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '
3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread
* commit '
3d8d9440d844816f065d2b10eb75bb693683cdad':
Fixes regarding densities in "Providing Resources" documentation page.
Gilles Debunne [Fri, 30 Jul 2010 18:53:16 +0000 (11:53 -0700)]
am
83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '
83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread
* commit '
83884db9dc0fbddb6ece566284259f6b941beb33':
Fixed doc typos in HeterogeneousExpandableList.java.
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:42:09 +0000 (11:42 -0700)]
Merge "Fix a bug that prevented the creation of EGL shared contexts."
Steve Howard [Fri, 30 Jul 2010 18:12:28 +0000 (11:12 -0700)]
am
7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '
7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp
* commit '
7c600369c9695de73ca37db552eb81b8b89d5e76':
Update Context.getSystemService() docs for download manager.
Steve Howard [Fri, 30 Jul 2010 18:09:48 +0000 (11:09 -0700)]
Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Alex Yakavenka [Fri, 30 Jul 2010 18:05:26 +0000 (11:05 -0700)]
am
a27353c1: Cat: Generalize stk into cat
Merge commit '
a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp
* commit '
a27353c1965911f69be8d02a01b15389189eab9d':
Cat: Generalize stk into cat
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:55:02 +0000 (10:55 -0700)]
am
3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"
Merge commit '
3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c' into gingerbread-plus-aosp
* commit '
3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c':
Cat: Move Stk imlpementation into Cat folder
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:54:59 +0000 (10:54 -0700)]
am
d8d03c89: Merge "Ccat: Initial CCAT implementation"
Merge commit '
d8d03c890b03f063bdb669e25742b4f4c69d2bcf' into gingerbread-plus-aosp
* commit '
d8d03c890b03f063bdb669e25742b4f4c69d2bcf':
Ccat: Initial CCAT implementation
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:44:00 +0000 (10:44 -0700)]
Merge "Cat: Move Stk imlpementation into Cat folder"
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:42:15 +0000 (10:42 -0700)]
Merge "Ccat: Initial CCAT implementation"
Eric Laurent [Fri, 30 Jul 2010 16:52:40 +0000 (09:52 -0700)]
am
92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit '
92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp
* commit '
92e847ed8e455dca3b2d33d92999e3960404d9af':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Mattias Larsson [Fri, 30 Jul 2010 15:45:05 +0000 (08:45 -0700)]
am
a4fd0078: Clear preferred activities when home process crashes
Merge commit '
a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp
* commit '
a4fd0078d138b433d2250a74833ee3cc6424143a':
Clear preferred activities when home process crashes
Andreas Huber [Fri, 30 Jul 2010 15:05:56 +0000 (08:05 -0700)]
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Mathias Agopian [Fri, 30 Jul 2010 03:54:12 +0000 (20:54 -0700)]
am
55a76dd8: Merge "fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Merge commit '
55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp
* commit '
55a76dd8d9996c1e93762d7611789aea696d536c':
fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
Mathias Agopian [Fri, 30 Jul 2010 03:52:26 +0000 (20:52 -0700)]
Merge "fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Mathias Agopian [Fri, 30 Jul 2010 01:21:03 +0000 (18:21 -0700)]
am
04d7e83e: Added SensorManager.getAltitude()
Merge commit '
04d7e83e65e246e154b5b346e3eb0081b741ae88' into gingerbread-plus-aosp
* commit '
04d7e83e65e246e154b5b346e3eb0081b741ae88':
Added SensorManager.getAltitude()
Mathias Agopian [Fri, 30 Jul 2010 01:20:51 +0000 (18:20 -0700)]
am
050b5624: Added SensorManager.getMinDelay()
Merge commit '
050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp
* commit '
050b56244ff46d43e4886018d7cd20f0b1dc02b9':
Added SensorManager.getMinDelay()
Mathias Agopian [Thu, 29 Jul 2010 23:51:38 +0000 (16:51 -0700)]
Added SensorManager.getMinDelay()
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).
Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.
Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
Jamie Gennis [Fri, 2 Jul 2010 18:39:12 +0000 (11:39 -0700)]
Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
Jean-Baptiste Queru [Fri, 30 Jul 2010 00:52:09 +0000 (17:52 -0700)]
am
4506c62a: fix inaccurate copyrights
Merge commit '
4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp
* commit '
4506c62abd5767d6d42a97e8e87793a1b3bcb625':
fix inaccurate copyrights
The Android Open Source Project [Fri, 30 Jul 2010 00:45:56 +0000 (17:45 -0700)]
Merge branch 'froyo' of git://android.git./platform/frameworks/base into HEAD
Jean-Baptiste Queru [Fri, 30 Jul 2010 00:35:37 +0000 (17:35 -0700)]
fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
Gilles Debunne [Fri, 30 Jul 2010 00:39:32 +0000 (17:39 -0700)]
Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Gilles Debunne [Fri, 30 Jul 2010 00:39:18 +0000 (17:39 -0700)]
Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Jean-Baptiste Queru [Thu, 29 Jul 2010 22:59:10 +0000 (15:59 -0700)]
am
9150cff6: Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
Merge commit '
9150cff64abc79927ade28061ac99a1ebf812905' into gingerbread-plus-aosp
* commit '
9150cff64abc79927ade28061ac99a1ebf812905':
Replaced /sdcard with Environment.getExternalStorageDirectory()
The Android Open Source Project [Thu, 29 Jul 2010 22:49:11 +0000 (15:49 -0700)]
am
3fb62752: am
392edec1: Merge from open-source froyo
Merge commit '
3fb627525e077fa5452a99ac1e2a7e9c41995044' into gingerbread-plus-aosp
* commit '
3fb627525e077fa5452a99ac1e2a7e9c41995044':
Fix a bug where we cleaned an apps external data when upgrading it. :(
The Android Open Source Project [Thu, 29 Jul 2010 22:46:48 +0000 (15:46 -0700)]
am
392edec1: Merge from open-source froyo
Merge commit '
392edec1162e9d00bcb66b271f43908f75d42ace' into gingerbread
* commit '
392edec1162e9d00bcb66b271f43908f75d42ace':
Fix a bug where we cleaned an apps external data when upgrading it. :(
The Android Open Source Project [Thu, 29 Jul 2010 22:38:41 +0000 (15:38 -0700)]
Merge from open-source froyo
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
Jean-Baptiste Queru [Thu, 29 Jul 2010 22:01:24 +0000 (15:01 -0700)]
Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
Jean-Baptiste Queru [Thu, 29 Jul 2010 21:53:42 +0000 (14:53 -0700)]
am
f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."
Merge commit '
f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp
* commit '
f0fa8416e13b2885b858b6974b101c70833e4729':
Make hasIccCard return true if RUIM card is present.
Jean-Baptiste Queru [Thu, 29 Jul 2010 21:37:48 +0000 (14:37 -0700)]
Merge "Make hasIccCard return true if RUIM card is present."
Romain Guy [Thu, 29 Jul 2010 21:32:34 +0000 (14:32 -0700)]
am
ce3ac5f0: Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Merge commit '
ce3ac5f02970fcab91e16ecb573931d209b1985c' into gingerbread-plus-aosp
* commit '
ce3ac5f02970fcab91e16ecb573931d209b1985c':
Corrected buffer overflow when parsing /proc/wakelocks
Romain Guy [Thu, 29 Jul 2010 21:32:29 +0000 (14:32 -0700)]
am
e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"
Merge commit '
e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp
* commit '
e53fe4a465a014788e3b93ca9f30f229481bc4e5':
Fixed a documentation Bug (Issue 9236)
Dianne Hackborn [Thu, 29 Jul 2010 21:12:17 +0000 (14:12 -0700)]
am
31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Merge commit '
31b5d5485f7336639d252da7ba979234dbd2f1e1' into gingerbread-plus-aosp
* commit '
31b5d5485f7336639d252da7ba979234dbd2f1e1':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Dianne Hackborn [Thu, 29 Jul 2010 21:07:14 +0000 (14:07 -0700)]
Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Romain Guy [Thu, 29 Jul 2010 21:00:48 +0000 (14:00 -0700)]
Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Romain Guy [Thu, 29 Jul 2010 21:00:02 +0000 (14:00 -0700)]
Merge "Fixed a documentation Bug (Issue 9236)"
Christopher Tate [Thu, 29 Jul 2010 20:58:00 +0000 (13:58 -0700)]
am
571180c4: Merge "Attempt to fix the SDK build" into gingerbread
Merge commit '
571180c4c72e0bb4f930f8971edf000a652f10f6' into gingerbread-plus-aosp
* commit '
571180c4c72e0bb4f930f8971edf000a652f10f6':
Attempt to fix the SDK build
Christopher Tate [Thu, 29 Jul 2010 20:53:37 +0000 (13:53 -0700)]
Merge "Attempt to fix the SDK build" into gingerbread
Christopher Tate [Thu, 29 Jul 2010 20:16:38 +0000 (13:16 -0700)]
Attempt to fix the SDK build
On the assumption that the local min() function declaration is in
conflict with some 'min' #define floating around, rename the local
function to min_of().
Change-Id: I62aa27f213c6093cc78805de611cf4aa75f0eef2
Jeff Brown [Thu, 29 Jul 2010 20:13:38 +0000 (13:13 -0700)]
am
aab985b9: Fix touch input in landscape mode.
Merge commit '
aab985b951c4cf5ec2753ffbec516164b3c03c3a' into gingerbread-plus-aosp
* commit '
aab985b951c4cf5ec2753ffbec516164b3c03c3a':
Fix touch input in landscape mode.
Jeff Brown [Thu, 29 Jul 2010 20:09:07 +0000 (13:09 -0700)]
am
6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.
Merge commit '
6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp
* commit '
6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
DO NOT MERGE: Fix input event injection ANRs on UI thread.
Jeff Brown [Thu, 29 Jul 2010 20:05:52 +0000 (13:05 -0700)]
Fix touch input in landscape mode.
Change-Id: I7d47e9b02e6443ed604a6bf842028a5db934d90d
Jeff Brown [Wed, 28 Jul 2010 22:48:59 +0000 (15:48 -0700)]
DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.
Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
Andreas Huber [Thu, 29 Jul 2010 18:11:46 +0000 (11:11 -0700)]
am
6dea6f4e: am
16263d9f: Squashed commit of the following:
Merge commit '
6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp
* commit '
6dea6f4e71b53e421564d783c227cbe0a2469183':
Squashed commit of the following:
Andreas Huber [Thu, 29 Jul 2010 18:07:49 +0000 (11:07 -0700)]
am
16263d9f: Squashed commit of the following:
Merge commit '
16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '
16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
Mike Lockwood [Thu, 29 Jul 2010 15:58:54 +0000 (08:58 -0700)]
am
8dc16c27: Fix typo in GPS mode logic.
Merge commit '
8dc16c27e23dae5bdf65fd2a2ced97c2f645a633' into gingerbread-plus-aosp
* commit '
8dc16c27e23dae5bdf65fd2a2ced97c2f645a633':
Fix typo in GPS mode logic.
Eric Laurent [Thu, 29 Jul 2010 14:43:10 +0000 (07:43 -0700)]
am
a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit '
a54d7d3d7dd691334189aab20d23c65710092869' into gingerbread-plus-aosp
* commit '
a54d7d3d7dd691334189aab20d23c65710092869':
Fixed underrun in audioflinger mixer.
Eric Laurent [Thu, 29 Jul 2010 10:35:52 +0000 (03:35 -0700)]
am
493941b8: Allow creation of an audio effect on a session with no audio tracks.
Merge commit '
493941b8d8a12ee843d9823c0177f8005a7be54f' into gingerbread-plus-aosp
* commit '
493941b8d8a12ee843d9823c0177f8005a7be54f':
Allow creation of an audio effect on a session with no audio tracks.
Chris Tate [Thu, 29 Jul 2010 01:16:14 +0000 (18:16 -0700)]
am
7b40518e: Merge "Change unistd.h to stddef.h to be correct" into gingerbread
Merge commit '
7b40518e56a3238b28b24a786a2ff22d5a425765' into gingerbread-plus-aosp
* commit '
7b40518e56a3238b28b24a786a2ff22d5a425765':
Change unistd.h to stddef.h to be correct
Chris Tate [Thu, 29 Jul 2010 01:14:51 +0000 (18:14 -0700)]
Merge "Change unistd.h to stddef.h to be correct" into gingerbread
Brett Chabot [Thu, 29 Jul 2010 00:11:01 +0000 (17:11 -0700)]
am
5f866a4a: Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '
5f866a4ac389a18613180b056d946ae5a7b84e10' into gingerbread-plus-aosp
* commit '
5f866a4ac389a18613180b056d946ae5a7b84e10':
Make FrameworkCoreHostTests use ddmlib-prebuilt.
Adam Powell [Wed, 28 Jul 2010 23:58:45 +0000 (16:58 -0700)]
am
a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit '
a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a' into gingerbread-plus-aosp
* commit '
a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a':
Fix a bug that could cause flings to last too long using a Scroller
Adam Powell [Wed, 28 Jul 2010 23:56:13 +0000 (16:56 -0700)]
Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Kenny Root [Wed, 28 Jul 2010 23:46:12 +0000 (16:46 -0700)]
Change unistd.h to stddef.h to be correct
size_t should be defined through inclusion of stddef.h instead of unistd.h
Change-Id: Ieaadacfca1e1c44c2533ea95f73fc060c1519b52
Kenny Root [Wed, 28 Jul 2010 23:43:08 +0000 (16:43 -0700)]
am
3de27d5a: Merge "Add stdint.h to fix sim-eng" into gingerbread
Merge commit '
3de27d5a56f4b9e3d76ac71445b33e47c635d207' into gingerbread-plus-aosp
* commit '
3de27d5a56f4b9e3d76ac71445b33e47c635d207':
Add stdint.h to fix sim-eng
Kenny Root [Wed, 28 Jul 2010 23:41:49 +0000 (16:41 -0700)]
Merge "Add stdint.h to fix sim-eng" into gingerbread
Kenny Root [Wed, 28 Jul 2010 23:39:52 +0000 (16:39 -0700)]
am
8c5d9430: Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
Merge commit '
8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6' into gingerbread-plus-aosp
* commit '
8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6':
Add unistd.h for size_t typedef to fix sim-eng
Kenny Root [Wed, 28 Jul 2010 23:37:20 +0000 (16:37 -0700)]
Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
Mathias Agopian [Wed, 28 Jul 2010 23:33:23 +0000 (16:33 -0700)]
am
9f2a91bc: Merge "fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '
9f2a91bc2b01c2cc60f73a0bae673225fdddec09' into gingerbread-plus-aosp
* commit '
9f2a91bc2b01c2cc60f73a0bae673225fdddec09':
fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
Kenny Root [Wed, 28 Jul 2010 23:31:24 +0000 (16:31 -0700)]
Add unistd.h for size_t typedef to fix sim-eng
Change-Id: Ida4f1742547f39539b601f13182c722aa7cf863e
Mathias Agopian [Wed, 28 Jul 2010 23:30:56 +0000 (16:30 -0700)]
Merge "fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Christopher Tate [Wed, 28 Jul 2010 22:38:38 +0000 (15:38 -0700)]
am
bae6fe24: Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread
Merge commit '
bae6fe242ff9a97840ff0c5d9d87c0575d261682' into gingerbread-plus-aosp
* commit '
bae6fe242ff9a97840ff0c5d9d87c0575d261682':
Support streaming of compressed assets > 1 megabyte
Christopher Tate [Wed, 28 Jul 2010 22:36:48 +0000 (15:36 -0700)]
Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread
Christopher Tate [Mon, 26 Jul 2010 18:24:18 +0000 (11:24 -0700)]
Support streaming of compressed assets > 1 megabyte
Compressed assets larger than one megabyte are now decompressed on demand
rather than being decompressed in their entirety and held in memory. Reading
the data in order is relatively efficient, as is seeking forward in the stream.
Seeking backwards is supported, but requires reprocessing the compressed data
from the beginning, so is very inefficient.
In addition, the size limit on compressed assets has been eliminated.
Change-Id: I6e68247957e6c53e7e8ba70d12764695f1723bad
James Dong [Wed, 28 Jul 2010 22:31:09 +0000 (15:31 -0700)]
am
bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit '
bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp
* commit '
bc1daf016020ce022ceb971f09e862da5ee82b1d':
Eliminate the linear cost associated with mSampleSizes.size()
James Dong [Wed, 28 Jul 2010 22:28:54 +0000 (15:28 -0700)]
Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Kenny Root [Wed, 28 Jul 2010 21:51:33 +0000 (14:51 -0700)]
am
f369a9b5: Remove stale temporary ASEC containers
Merge commit '
f369a9b5f7b2ae75875753caf90ec68fd9dbc144' into gingerbread-plus-aosp
* commit '
f369a9b5f7b2ae75875753caf90ec68fd9dbc144':
Remove stale temporary ASEC containers
Kenny Root [Wed, 28 Jul 2010 21:51:29 +0000 (14:51 -0700)]
am
56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '
56c02dc3d325bab8549ec34b9d6aa7c62ef742d0' into gingerbread-plus-aosp
* commit '
56c02dc3d325bab8549ec34b9d6aa7c62ef742d0':
Fix getTempContainerId()
Kenny Root [Wed, 28 Jul 2010 21:48:40 +0000 (14:48 -0700)]
Merge "Fix getTempContainerId()" into gingerbread
Scott Main [Wed, 28 Jul 2010 21:27:13 +0000 (14:27 -0700)]
am
b1bb7180: am
3bf5c4cd: Merge "fix markup error bug:
2871538" into froyo
Merge commit '
b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp
* commit '
b1bb7180ec3446208ea717d96f6a507ea9955a13':
fix markup error
Jeff Brown [Wed, 28 Jul 2010 21:25:05 +0000 (14:25 -0700)]
am
6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '
6d0fec2de3601821f4f44eeb7d7deedebb2b7117' into gingerbread-plus-aosp
* commit '
6d0fec2de3601821f4f44eeb7d7deedebb2b7117':
Refactor input reader to support new device types more easily.
Scott Main [Wed, 28 Jul 2010 21:23:16 +0000 (14:23 -0700)]
am
3bf5c4cd: Merge "fix markup error bug:
2871538" into froyo
Merge commit '
3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread
* commit '
3bf5c4cd30f8bd598842d8ded5f1655406b5c27a':
fix markup error
Scott Main [Wed, 28 Jul 2010 21:20:18 +0000 (14:20 -0700)]
Merge "fix markup error bug:
2871538" into froyo
Jeff Brown [Sat, 24 Jul 2010 04:28:06 +0000 (21:28 -0700)]
Refactor input reader to support new device types more easily.
Refactored the input reader so that each raw input protocol is handled
by a separate subclass of the new InputMapper type. This way, behaviors
pertaining to keyboard, trackballs, touchscreens, switches and other
devices are clearly distinguished for improved maintainability.
Added partial support for describing capabilities of input devices
(incomplete and untested for now, will be fleshed out in later commits).
Simplified EventHub interface somewhat since InputReader is taking over
more of the work.
Cleaned up some of the interactions between InputManager and
WindowManagerService related to reading input state.
Fixed swiping finger from screen edge into display area.
Added logging of device information to 'dumpsys window'.
Change-Id: I17faffc33e3aec3a0f33f0b37e81a70609378612
Dan Egnor [Wed, 28 Jul 2010 19:42:16 +0000 (12:42 -0700)]
am
b350bec5: am
17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '
b350bec514eb9fee473e4ef62680c53e992dc49b' into gingerbread-plus-aosp
* commit '
b350bec514eb9fee473e4ef62680c53e992dc49b':
Minor changes to ContentProvider javadoc to improve consistency.
Dan Egnor [Wed, 28 Jul 2010 19:40:16 +0000 (12:40 -0700)]
am
17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '
17876aa586cc9acfb3e5b909c14b9e73537a1a8d' into gingerbread
* commit '
17876aa586cc9acfb3e5b909c14b9e73537a1a8d':
Minor changes to ContentProvider javadoc to improve consistency.
James Dong [Wed, 28 Jul 2010 19:19:33 +0000 (12:19 -0700)]
am
7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested
Merge commit '
7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp
* commit '
7e397842d53a4242a019daa4b234910273121c30':
Reduce memory usage by the MP4 file writer
James Dong [Wed, 28 Jul 2010 19:00:58 +0000 (12:00 -0700)]
am
5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit '
5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp
* commit '
5587bb7e375c17c1320918e6f473625af1f5e5ac':
Interleave the audio and video by default
James Dong [Wed, 28 Jul 2010 18:58:12 +0000 (11:58 -0700)]
Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Joe Onorato [Wed, 28 Jul 2010 17:16:39 +0000 (10:16 -0700)]
am
0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Merge commit '
0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp
* commit '
0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Joe Onorato [Wed, 28 Jul 2010 16:53:12 +0000 (09:53 -0700)]
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Eric Laurent [Wed, 28 Jul 2010 14:51:02 +0000 (07:51 -0700)]
am
62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '
62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp
* commit '
62d83a0c894b72d9abda1340d278d2aeec11e0fb':
Audio effects: modified command() parameter types.
Eric Laurent [Wed, 28 Jul 2010 14:48:49 +0000 (07:48 -0700)]
Merge "Audio effects: modified command() parameter types." into gingerbread