summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge "Fix up PackageManager tests" into gingerbreadKenny Root2010-08-050-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
* | | | | | | Merge "Specification of codec specific data as part of the session ↵Andreas Huber2010-08-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | description is now optional." into gingerbread
* | | | | | | Merge "Move SIP telephony related codes to framework." into gingerbreadChung-yih Wang2010-08-040-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Fix crash when startForeground posts a broken Notification." into ↵Daniel Sandler2010-08-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | gingerbread
* | | | | | | | Merge "Move the sip related codes to framework." into gingerbreadChung-yih Wang2010-08-040-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Add register methods in CallManager "do not merge"" into gingerbreadJohn Wang2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ am 8dd87ad9: fix some doc errors in the resources; add link to resource docs ↵Scott Main2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for ColorStateList class Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread * commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41': fix some doc errors in the resources;
* | | | | | | | | | am 5b86de94: fix doc bugsScott Main2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread * commit '5b86de94a163ce4c52ab08a9820f9d78414e1767': fix doc bugs
* | | | | | | | | | Free scanBuf in ZipFileROKenny Root2010-08-041-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Fix divide by zero." into gingerbreadMarco Nelissen2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Failure to move .dex in eng builds is not fatal" into gingerbreadKenny Root2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Add support for PSC of serving cell." into gingerbreadjsh2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Don't return a decoder error if the encoded stream does not start ↵Andreas Huber2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | with SPS/PPS." into gingerbread
* | | | | | | | | | | Merge "Support for Gtalk video, includes AMR/H.263 assembler and ↵Andreas Huber2010-08-040-0/+0
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Add Blocked Device property." into gingerbreadJaikumar Ganesh2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Fix issue 2876124." into gingerbreadEric Laurent2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Fix the build." into gingerbreadMarco Nelissen2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "Only allow one movePackage operation in-flight" into gingerbreadKenny Root2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | / / / / / / / / / / | | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "NEW_API: Unhide audio effect APIs." into gingerbreadEric Laurent2010-08-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
* | | | | | | | | | | Merge "Usage Stats: don't block writing stats to disk." into gingerbreadBrad Fitzpatrick2010-08-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Frameworks core tests size cleanup." into gingerbreadBrett Chabot2010-08-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Replace CHECK with a failure return value when ↵James Dong2010-08-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
* | | | | | | | | | | | Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into ↵Chris Tate2010-08-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | | | | | Enhanced VelocityTracker for > 5 pointers and fixed bugs.Jeff Brown2010-07-301-1/+3
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into ↵Mathias Agopian2010-08-034-51/+233
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | | | | fix [2421247] implement eglGetProcAddress(), needed in the ndkMathias Agopian2010-08-024-51/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
* | | | | | | | | | | Merge "Improving profiling of views." into gingerbreadKonstantin Lopyrev2010-08-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "File writer has a designated writer thread now" into gingerbreadJames Dong2010-08-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" ↵James Dong2010-08-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | into gingerbread
* | | | | | | | | | | | Merge "Add lost frame handling in AudioSource" into gingerbreadJames Dong2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ am 5aa4680e: update device dashboardScott Main2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread * commit '5aa4680eb07fd4ca9212ee29c4fc0659e00c958d': update device dashboard
* | | | | | | | | | | | | Merge "New secure setting for mobile download size limit." into gingerbreadSteve Howard2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge changes Ic30e2801,I387bab4d into gingerbreadJohn Wang2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Handle call list in CallManager "do not merge". Create CallManager class "do not merge"
* | | | | | | | | | | | | Merge "Mute a common-case progress log about input injection" into gingerbreadChristopher Tate2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Do not deference before null check" into gingerbreadKenny Root2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.Wink Saville2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | / / / / / / / / / | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread * commit 'c69f5be0ed3529564e5db6874de52775c2c99007': Add PhoneSubInfo.getCompleteVoiceMailNumber.
* | | | | | | | | | | | am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyoScott Main2010-08-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | / / / / / | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread * commit '9cd797902ec8404c5958214fc078d75e87248bf3': Doc change: Add nexus one to dev phones.
| * | | | | | | | | | Merge "Doc change: Add nexus one to dev phones." into froyoScott Main2010-08-020-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge "Make the systemui process persistent." into gingerbreadDianne Hackborn2010-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "remove copybit hack from software opengl (libagl)" into gingerbreadMathias Agopian2010-07-309-811/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | remove copybit hack from software opengl (libagl)Mathias Agopian2010-07-299-811/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | am 2ff1ba01: Doc change: Cleanup for licensing doc.Dirk Dougherty2010-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread * commit '2ff1ba012c59169c9719cfab4516b9149414380b': Doc change: Cleanup for licensing doc.
* | | | | | | | | | | | Merge "Only install after MCS success" into gingerbreadKenny Root2010-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "StrictMode: time violations in Binder calls" into gingerbreadBrad Fitzpatrick2010-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbreadJames Dong2010-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
* | | | | | | | | | | Merge "Improve thread safety of input mappers." into gingerbreadJeff Brown2010-07-302-490/+579
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve thread safety of input mappers.Jeff Brown2010-07-302-490/+579
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Lower the lower bound for max file duration check" into gingerbreadJames Dong2010-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "DO NOT MERGE" into gingerbreadXia Wang2010-07-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | / / / / / | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
generated by cgit v1.1 at 2025-02-15 15:52:57 +0000