OSDN Git Service
Steve Howard [Mon, 2 Aug 2010 23:49:22 +0000 (16:49 -0700)]
Merge "New secure setting for mobile download size limit." into gingerbread
John Wang [Mon, 2 Aug 2010 22:31:37 +0000 (15:31 -0700)]
Merge changes Ic30e2801,I387bab4d into gingerbread
* changes:
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
Christopher Tate [Mon, 2 Aug 2010 22:14:44 +0000 (15:14 -0700)]
Merge "Mute a common-case progress log about input injection" into gingerbread
Kenny Root [Mon, 2 Aug 2010 19:33:40 +0000 (12:33 -0700)]
Merge "Do not deference before null check" into gingerbread
Wink Saville [Mon, 2 Aug 2010 19:02:42 +0000 (12:02 -0700)]
am
c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit '
c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread
* commit '
c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Scott Main [Mon, 2 Aug 2010 16:23:50 +0000 (09:23 -0700)]
am
9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '
9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread
* commit '
9cd797902ec8404c5958214fc078d75e87248bf3':
Doc change: Add nexus one to dev phones.
Scott Main [Mon, 2 Aug 2010 16:16:30 +0000 (09:16 -0700)]
Merge "Doc change: Add nexus one to dev phones." into froyo
Dianne Hackborn [Sat, 31 Jul 2010 02:10:01 +0000 (19:10 -0700)]
Merge "Make the systemui process persistent." into gingerbread
Mathias Agopian [Sat, 31 Jul 2010 01:01:25 +0000 (18:01 -0700)]
Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Dirk Dougherty [Sat, 31 Jul 2010 00:37:39 +0000 (17:37 -0700)]
am
2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '
2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread
* commit '
2ff1ba012c59169c9719cfab4516b9149414380b':
Doc change: Cleanup for licensing doc.
Kenny Root [Fri, 30 Jul 2010 23:55:37 +0000 (16:55 -0700)]
Merge "Only install after MCS success" into gingerbread
Brad Fitzpatrick [Fri, 30 Jul 2010 22:20:28 +0000 (15:20 -0700)]
Merge "StrictMode: time violations in Binder calls" into gingerbread
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: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:44:23 +0000 (13:44 -0700)]
Merge "DO NOT MERGE" into gingerbread
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:08:31 +0000 (12:08 -0700)]
resolved conflicts for merge of
27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
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.
Steve Howard [Fri, 30 Jul 2010 18:09:48 +0000 (11:09 -0700)]
Merge "Update Context.getSystemService() docs for download manager." into gingerbread
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 06:28:03 +0000 (23:28 -0700)]
remove copybit hack from software opengl (libagl)
h/w acceleration is not supported through software gl + copybit anylonger,
instead, h/w opengl must be used. in the system compositor, a new h/w
composition api will be introduced to allow h/w accelerated composition with
overlays and/or 2D blocks.
Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
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 [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
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
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
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
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: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: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:
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
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:41:49 +0000 (16:41 -0700)]
Merge "Add stdint.h to fix sim-eng" into gingerbread
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
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: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:28:54 +0000 (15:28 -0700)]
Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
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: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: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 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 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:48:49 +0000 (07:48 -0700)]
Merge "Audio effects: modified command() parameter types." into gingerbread
Mike Lockwood [Wed, 28 Jul 2010 11:04:18 +0000 (04:04 -0700)]
Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Mathias Agopian [Wed, 28 Jul 2010 03:11:35 +0000 (20:11 -0700)]
fix [
2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
this situation happened when the last buffer needed to be resized
(or allocated, the first time). the assumption was that the buffer
was in use by SF itself as the current buffer (obviously, this
assumption made no sense when the buffer had never been allocated, btw).
the system would wait until some other buffer became the "front" buffer.
we fix this problem by entirely removing the requirement that the
buffer being resized cannot be the front buffer. instead, we just
allocate a new buffer and replace the front buffer by the new one.
the downside is that this uses more memory (an extra buffer) for a
brief amount of time while the old buffer is being reallocated and
before it has actually been replaced.
Change-Id: I022e4621209474ceb1c671b23deb4188eaaa7285
Brad Fitzpatrick [Wed, 28 Jul 2010 01:34:08 +0000 (18:34 -0700)]
Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Steve Howard [Tue, 27 Jul 2010 23:55:14 +0000 (16:55 -0700)]
Merge "One last change to current.xml for new download manager API" into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 23:52:12 +0000 (16:52 -0700)]
am
86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '
86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread
* commit '
86c035f0d176be9cb06b1e4f2390c25701417586':
COMMENT ONLY change to clarify ContentProvider documentation.
Brad Fitzpatrick [Tue, 27 Jul 2010 23:44:53 +0000 (16:44 -0700)]
Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Steve Howard [Tue, 27 Jul 2010 23:29:37 +0000 (16:29 -0700)]
Merge "Un-@hide new download manager public API." into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 22:19:08 +0000 (15:19 -0700)]
Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 20:59:47 +0000 (13:59 -0700)]
Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread
Brad Fitzpatrick [Tue, 27 Jul 2010 16:49:11 +0000 (09:49 -0700)]
Replace several IPCThreadState::get() lookups with one.
Also, make StrictMode's ThreadLocal final.
Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
Dan Egnor [Tue, 27 Jul 2010 17:22:58 +0000 (10:22 -0700)]
Merge "Remove a log message Jason doesn't like" into gingerbread
Joe Onorato [Tue, 27 Jul 2010 16:14:42 +0000 (09:14 -0700)]
am
8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i
Merge commit '
8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread
* commit '
8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
Add a method to let a properly permissioned app directly
Joe Onorato [Tue, 27 Jul 2010 16:05:05 +0000 (09:05 -0700)]
Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo
Mathias Agopian [Tue, 27 Jul 2010 04:14:59 +0000 (21:14 -0700)]
fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
rework how our EGL wrapper manages EGLConfig:
- we now store the EGLConfig with the EGLSurface and EGLContext
so that we can have easy access to it from eglQueryContext
and eglQuerySurface.
- EGLConfig now are an index into a sorted table of egl_config_t,
we use a binary search to retrieve our EGLConfig (the index) from
the implementation's EGLConfig.
- egl_config_t keeps track of the implementation's index,
EGLConfig and CONFIG_ID as well as our CONFIG_ID.
In many ways, this implementation is simpler and more robust, as it doesn't
assume anything about the number of implementations nor what EGLConfig is
made of (the previous code assumed EGLConfig didn't usem more than 24-bits).
Change-Id: Id5abe923aacb6e1fd2b63bd8c15d7b04ae824922
Dirk Dougherty [Tue, 27 Jul 2010 03:01:12 +0000 (20:01 -0700)]
am
0ac8ac30: Doc change: Add docs for licensing service.
Merge commit '
0ac8ac301d056604485aeca9ffe5ce8d1e63ef19' into gingerbread
* commit '
0ac8ac301d056604485aeca9ffe5ce8d1e63ef19':
Doc change: Add docs for licensing service.
Brad Fitzpatrick [Tue, 27 Jul 2010 02:44:50 +0000 (19:44 -0700)]
Merge "Fix StrictMode for Binder.dump()" into gingerbread
Eric Laurent [Mon, 26 Jul 2010 17:09:54 +0000 (10:09 -0700)]
Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Mike Lockwood [Mon, 26 Jul 2010 15:11:54 +0000 (08:11 -0700)]
Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Eric Laurent [Mon, 26 Jul 2010 09:17:52 +0000 (02:17 -0700)]
Merge "LVM release 1.04." into gingerbread
Mathias Agopian [Sat, 24 Jul 2010 00:03:43 +0000 (17:03 -0700)]
Merge "Report sensor events to BatteryStats service" into gingerbread
Mathias Agopian [Fri, 23 Jul 2010 23:39:34 +0000 (16:39 -0700)]
Merge "SensorService handles last known state properly" into gingerbread
Mathias Agopian [Fri, 23 Jul 2010 03:07:01 +0000 (20:07 -0700)]
Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
Mathias Agopian [Fri, 23 Jul 2010 01:57:41 +0000 (18:57 -0700)]
Fix a memory corruption when writting Sensor into a parcel
Change-Id: I03f703ae2224f43924031bfea4c68aa979bb9f05
Mathias Agopian [Fri, 23 Jul 2010 00:23:17 +0000 (17:23 -0700)]
Merge "filter sensor event by connection" into gingerbread
Mathias Agopian [Thu, 22 Jul 2010 21:38:49 +0000 (14:38 -0700)]
Merge "propagate sensor event rate properly to the sensor HAL" into gingerbread
Andreas Huber [Thu, 22 Jul 2010 20:47:41 +0000 (13:47 -0700)]
Merge "Various changes to improve rtsp networking, reduce packet loss and adapt to ALooper API changes." into gingerbread
Mathias Agopian [Wed, 21 Jul 2010 22:59:50 +0000 (15:59 -0700)]
propagate sensor event rate properly
Change-Id: I32e67d30e4295285a6827956cc8161b2025d70bc
Mathias Agopian [Wed, 21 Jul 2010 23:07:32 +0000 (16:07 -0700)]
Merge "Better dumpsys logs" into gingerbread
Mathias Agopian [Wed, 21 Jul 2010 23:07:15 +0000 (16:07 -0700)]
Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread
Mathias Agopian [Wed, 21 Jul 2010 23:06:46 +0000 (16:06 -0700)]
Merge "new SensorService" into gingerbread
Dan Egnor [Wed, 21 Jul 2010 20:55:13 +0000 (13:55 -0700)]
am
e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo
Merge commit '
e8605af513e846f6cd223c9e92461189727d8c9b' into gingerbread
* commit '
e8605af513e846f6cd223c9e92461189727d8c9b':
Avoid leaking file descriptors when returning drop box events.
Dan Egnor [Wed, 21 Jul 2010 20:53:23 +0000 (13:53 -0700)]
Merge "Avoid leaking file descriptors when returning drop box events." into froyo
Andreas Huber [Wed, 21 Jul 2010 19:31:14 +0000 (12:31 -0700)]
Merge "Add a seek test to the stagefright commandline tool." into gingerbread
Tom Taylor [Wed, 21 Jul 2010 18:22:22 +0000 (11:22 -0700)]
am
dbac180d: Fix a merge problem with html mms
Merge commit '
dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread
* commit '
dbac180d8342a7db2bb9994f937869eecb6b50ff':
Fix a merge problem with html mms
Andreas Huber [Wed, 21 Jul 2010 17:36:08 +0000 (10:36 -0700)]
Merge "Support finer seek control on MediaSources." into gingerbread
James Dong [Tue, 20 Jul 2010 21:29:39 +0000 (14:29 -0700)]
Merge "Progress status notification" into gingerbread
Jason Parks [Tue, 20 Jul 2010 21:01:39 +0000 (14:01 -0700)]
Merge "Only print out wake locks in the if the wakelock was held." into gingerbread
Dan Egnor [Tue, 20 Jul 2010 20:59:43 +0000 (13:59 -0700)]
am
2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Merge commit '
2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread
* commit '
2f0dc6d9f50ceece294e9db393583e655d3bf781':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Dan Egnor [Tue, 20 Jul 2010 20:57:08 +0000 (13:57 -0700)]
Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Scott Main [Tue, 20 Jul 2010 20:53:55 +0000 (13:53 -0700)]
am
2316d626: docs: add information about using color resources as drawables
Merge commit '
2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread
* commit '
2316d6260862230af10d8ca3ff446ad3f560f712':
docs: add information about using color resources as drawables
Dan Egnor [Tue, 20 Jul 2010 20:23:09 +0000 (13:23 -0700)]
Merge "resolved conflicts for merge of
9bc4039a to gingerbread" into gingerbread
Dan Egnor [Tue, 20 Jul 2010 18:30:17 +0000 (11:30 -0700)]
resolved conflicts for merge of
9bc4039a to gingerbread
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
Eric Laurent [Tue, 20 Jul 2010 18:25:35 +0000 (11:25 -0700)]
Merge "Audio policy manager changes for audio effects" into gingerbread
Andreas Huber [Tue, 20 Jul 2010 16:18:58 +0000 (09:18 -0700)]
Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread