OSDN Git Service
Konstantin Lopyrev [Tue, 10 Aug 2010 00:02:39 +0000 (17:02 -0700)]
Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Jean-Michel Trivi [Mon, 9 Aug 2010 21:19:08 +0000 (14:19 -0700)]
Merge "Fix bug
2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Jaikumar Ganesh [Mon, 9 Aug 2010 20:50:28 +0000 (13:50 -0700)]
Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
James Dong [Mon, 9 Aug 2010 20:35:54 +0000 (13:35 -0700)]
Merge "Support multiple PPS and SPS in avcC box" into gingerbread
Andreas Huber [Mon, 9 Aug 2010 18:30:34 +0000 (11:30 -0700)]
Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Eric Laurent [Mon, 9 Aug 2010 17:42:27 +0000 (10:42 -0700)]
Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
Dan Egnor [Sat, 7 Aug 2010 01:55:05 +0000 (18:55 -0700)]
am
b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '
b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread
* commit '
b37bca9e79489a1abd848ce762bb7d87203b3414':
COMMENT ONLY change to fix some formatting glitches and
Dan Egnor [Fri, 6 Aug 2010 23:39:02 +0000 (16:39 -0700)]
Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Andreas Huber [Fri, 6 Aug 2010 22:21:47 +0000 (15:21 -0700)]
Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread
Steve Howard [Fri, 6 Aug 2010 21:28:37 +0000 (14:28 -0700)]
Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Konstantin Lopyrev [Fri, 6 Aug 2010 21:10:29 +0000 (14:10 -0700)]
Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Kenny Root [Thu, 5 Aug 2010 23:21:23 +0000 (16:21 -0700)]
Fix String8::operator+
The LHS was ignored when using:
String8 + String8
String8 + (const char*)
Add unit tests for above.
Bug:
2898473
Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
Chung-yih Wang [Fri, 6 Aug 2010 02:35:54 +0000 (19:35 -0700)]
Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread
Chung-yih Wang [Fri, 6 Aug 2010 02:35:45 +0000 (19:35 -0700)]
Merge "Add SIP service into system server." into gingerbread
Adam Powell [Fri, 6 Aug 2010 01:39:37 +0000 (18:39 -0700)]
am
90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
Merge commit '
9093717985095913934c079abfa879049bd33ba5' into gingerbread
* commit '
9093717985095913934c079abfa879049bd33ba5':
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Adam Powell [Fri, 6 Aug 2010 01:33:31 +0000 (18:33 -0700)]
Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo
Fred Quintana [Fri, 6 Aug 2010 00:42:05 +0000 (17:42 -0700)]
am
cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit '
cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread
* commit '
cdf16787fc1234b7f21a9cddc6f8a27b4056bc39':
Changed SyncOperation.toKey() to not rely on the implementation of
Fred Quintana [Fri, 6 Aug 2010 00:36:27 +0000 (17:36 -0700)]
Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Vasu Nori [Fri, 6 Aug 2010 00:11:53 +0000 (17:11 -0700)]
Merge "(gingerbread) remove unused tests. bug:
2898376" into gingerbread
Scott Main [Thu, 5 Aug 2010 22:53:04 +0000 (15:53 -0700)]
am
005e2400: Merge "fix xml sample error" into froyo
Merge commit '
005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread
* commit '
005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c':
fix xml sample error
Scott Main [Thu, 5 Aug 2010 22:49:08 +0000 (15:49 -0700)]
Merge "fix xml sample error" into froyo
Eric Rowe [Thu, 5 Aug 2010 22:10:15 +0000 (15:10 -0700)]
am
982f1521: Merge "Checkin initial bluetooth stress tests." into froyo
Merge commit '
982f1521a662d274eca1216707d874f148396ac6' into gingerbread
* commit '
982f1521a662d274eca1216707d874f148396ac6':
Checkin initial bluetooth stress tests.
James Dong [Thu, 5 Aug 2010 22:10:03 +0000 (15:10 -0700)]
Merge "Use the target color format from the camera source if possible" into gingerbread
Eric Rowe [Thu, 5 Aug 2010 21:49:22 +0000 (14:49 -0700)]
Merge "Checkin initial bluetooth stress tests." into froyo
James Dong [Thu, 5 Aug 2010 18:04:14 +0000 (11:04 -0700)]
Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread
Brian Carlstrom [Thu, 5 Aug 2010 17:35:53 +0000 (10:35 -0700)]
Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Andreas Huber [Thu, 5 Aug 2010 17:11:28 +0000 (10:11 -0700)]
Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
Andreas Huber [Thu, 5 Aug 2010 17:11:18 +0000 (10:11 -0700)]
Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread
Kenny Root [Thu, 5 Aug 2010 17:02:30 +0000 (10:02 -0700)]
Merge "Fix up PackageManager tests" into gingerbread
Andreas Huber [Thu, 5 Aug 2010 16:18:38 +0000 (09:18 -0700)]
Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
Chung-yih Wang [Thu, 5 Aug 2010 04:16:48 +0000 (21:16 -0700)]
Merge "Move SIP telephony related codes to framework." into gingerbread
Daniel Sandler [Thu, 5 Aug 2010 03:33:32 +0000 (20:33 -0700)]
Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
Chung-yih Wang [Thu, 5 Aug 2010 02:28:23 +0000 (19:28 -0700)]
Merge "Move the sip related codes to framework." into gingerbread
John Wang [Thu, 5 Aug 2010 01:54:55 +0000 (18:54 -0700)]
Merge "Add register methods in CallManager "do not merge"" into gingerbread
Scott Main [Thu, 5 Aug 2010 01:02:25 +0000 (18:02 -0700)]
am
8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
Merge commit '
8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread
* commit '
8dd87ad9440bc63bc312b06f292adcd2642b1c41':
fix some doc errors in the resources;
Scott Main [Thu, 5 Aug 2010 01:02:18 +0000 (18:02 -0700)]
Kenny Root [Wed, 4 Aug 2010 23:30:40 +0000 (16:30 -0700)]
Free scanBuf in ZipFileRO
In the success case, the 65kB scanBuf was not freed!
Also, get rid of annoying complaints about ssize_t from printf in error
cases.
Change-Id: If154ac19bf47637f898b4ec8c8e27c9a073a7b81
Marco Nelissen [Wed, 4 Aug 2010 22:37:37 +0000 (15:37 -0700)]
Merge "Fix divide by zero." into gingerbread
Kenny Root [Wed, 4 Aug 2010 22:01:56 +0000 (15:01 -0700)]
Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
jsh [Wed, 4 Aug 2010 21:32:19 +0000 (14:32 -0700)]
Merge "Add support for PSC of serving cell." into gingerbread
Andreas Huber [Wed, 4 Aug 2010 21:16:20 +0000 (14:16 -0700)]
Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
Andreas Huber [Wed, 4 Aug 2010 21:06:12 +0000 (14:06 -0700)]
Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Jaikumar Ganesh [Wed, 4 Aug 2010 18:28:55 +0000 (11:28 -0700)]
Merge "Add Blocked Device property." into gingerbread
Eric Fischer [Wed, 4 Aug 2010 17:40:36 +0000 (10:40 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Laurent [Wed, 4 Aug 2010 17:03:36 +0000 (10:03 -0700)]
Merge "Fix issue
2876124." into gingerbread
Marco Nelissen [Wed, 4 Aug 2010 16:22:31 +0000 (09:22 -0700)]
Merge "Fix the build." into gingerbread
Kenny Root [Wed, 4 Aug 2010 16:15:48 +0000 (09:15 -0700)]
Merge "Only allow one movePackage operation in-flight" into gingerbread
Eric Laurent [Wed, 4 Aug 2010 15:42:37 +0000 (08:42 -0700)]
Merge "NEW_API: Unhide audio effect APIs." into gingerbread
Brad Fitzpatrick [Tue, 3 Aug 2010 23:57:47 +0000 (16:57 -0700)]
Merge "Usage Stats: don't block writing stats to disk." into gingerbread
Brett Chabot [Tue, 3 Aug 2010 23:02:09 +0000 (16:02 -0700)]
Merge "Frameworks core tests size cleanup." into gingerbread
James Dong [Tue, 3 Aug 2010 22:54:32 +0000 (15:54 -0700)]
Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Chris Tate [Tue, 3 Aug 2010 19:22:50 +0000 (12:22 -0700)]
Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
Mathias Agopian [Tue, 3 Aug 2010 18:29:15 +0000 (11:29 -0700)]
Merge "fix [
2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
Konstantin Lopyrev [Tue, 3 Aug 2010 18:24:23 +0000 (11:24 -0700)]
Merge "Improving profiling of views." into gingerbread
James Dong [Tue, 3 Aug 2010 17:35:55 +0000 (10:35 -0700)]
Merge "File writer has a designated writer thread now" into gingerbread
James Dong [Tue, 3 Aug 2010 16:59:11 +0000 (09:59 -0700)]
Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Mathias Agopian [Tue, 3 Aug 2010 00:34:32 +0000 (17:34 -0700)]
fix [
2421247] implement eglGetProcAddress(), needed in the ndk
Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
James Dong [Tue, 3 Aug 2010 01:13:54 +0000 (18:13 -0700)]
Merge "Add lost frame handling in AudioSource" into gingerbread
Scott Main [Tue, 3 Aug 2010 00:42:11 +0000 (17:42 -0700)]
am
5aa4680e: update device dashboard
Merge commit '
5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread
* commit '
5aa4680eb07fd4ca9212ee29c4fc0659e00c958d':
update device dashboard
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
Jeff Brown [Sat, 31 Jul 2010 02:20:11 +0000 (19:20 -0700)]
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
Improved PointerLocation tool to use VelocityTracker more efficiently
and correctly when multiple pointers are down.
Fixed a bug in TouchInputMapper where it was not correctly copying
the id to index map in the last touch data. This could cause strange
behavior on secondary pointer up events.
Also added finished callback pooling in InputQueue.
Change-Id: Ia85e52ac2fb7350960ea1d7edfbe81a1b3e8267b
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