summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Initial tool for OBB manipulationKenny Root2010-08-112-3/+43
| | | | | | | Add "obbtool" host command for adding, removing, and querying Opaque Binary Blob (OBB) information from a file. Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
* Merge "More native work." into gingerbreadDianne Hackborn2010-08-113-57/+70
|\
| * More native work.Dianne Hackborn2010-08-113-57/+70
|/ | | | | | | Implement save/restore of state, and add native APIs for configuration information. Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
* Merge "SipAudioCall: perform local ops before network op in endCall()" into ↵Hung-ying Tyan2010-08-100-0/+0
|\ | | | | | | gingerbread
* \ Merge "Add the a power test case which simply do the audio playback. The ↵Yu Shan Emily Lau2010-08-100-0/+0
|\ \ | | | | | | | | | actual power measurement will be done by another application." into gingerbread
* \ \ Merge "Fix public bug ↵Adam Powell2010-08-100-0/+0
|\ \ \ | | | | | | | | | | | | http://code.google.com/p/android/issues/detail?id=10067" into gingerbread
* \ \ \ Merge "Categorizing exported view properties." into gingerbreadKonstantin Lopyrev2010-08-100-0/+0
|\ \ \ \ | |/ / / |/| | |
* | | | Fix safe mode and KeyEvent.getMaxKeyCode().Jeff Brown2010-08-102-0/+10
| | | | | | | | | | | | | | | | | | | | Bug: 2901731 Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
* | | | Merge "Optimize VelocityTracker to run in linear time." into gingerbreadJeff Brown2010-08-100-0/+0
|\ \ \ \ | |_|/ / |/| | |
* | | | Merge "Remove some obsolete code." into gingerbreadAndreas Huber2010-08-100-0/+0
|\ \ \ \
* \ \ \ \ Merge "improve a bit the implementation of eglGetProcAddress" into gingerbreadMathias Agopian2010-08-101-86/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | improve a bit the implementation of eglGetProcAddressMathias Agopian2010-08-091-86/+32
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
* | | | | Merge "Add input buffer size check for software video encoders" into gingerbreadJames Dong2010-08-100-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge "We're now going to ignore timestamps completely in gtalk video ↵Andreas Huber2010-08-100-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
* \ \ \ \ \ \ Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-08-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | am 301c437b: Remove @LargeTest annotationsEric Rowe2010-08-100-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread * commit '301c437b554e2152f3f6fffadc680f5cbf8e8231': Remove @LargeTest annotations
* \ \ \ \ \ \ \ Merge "Many, many developers misread or don't read the http specs and ↵Andreas Huber2010-08-100-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | | terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
* | | | | | | Merge "Only check the codec specific data when the output buffer contains ↵James Dong2010-08-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | kKeyIsCodecConfig in MP4 writer" into gingerbread
* | | | | | | Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbreadBrett Chabot2010-08-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge "SIP: clean up unused class and fields." into gingerbreadHung-ying Tyan2010-08-090-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
* | | | | | Merge "Update javadoc for the API and change return of getBondedDevices()." ↵Jaikumar Ganesh2010-08-090-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gingerbread
* \ \ \ \ \ \ Merge "Fix focus notification" into gingerbreadKonstantin Lopyrev2010-08-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Make sure profiling is done only for views that are actually ↵Konstantin Lopyrev2010-08-090-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | measured, laid out and drawn." into gingerbread
* | | | | | Merge "Fix bug 2684341 Don't steal the media button event from the phone app ↵Jean-Michel Trivi2010-08-090-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | is the phone is ringing, even in silent mode." into gingerbread
* | | | | | Merge "Check whether Bluetooth is enabled before making any API calls." into ↵Jaikumar Ganesh2010-08-090-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
* \ \ \ \ \ \ Merge "Support multiple PPS and SPS in avcC box" into gingerbreadJames Dong2010-08-090-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge "Support for extracting G.711 a-law and mu-law audio from WAV files ↵Andreas Huber2010-08-090-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | and a corresponding software decoder." into gingerbread
* | | | | | | Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbreadEric Laurent2010-08-090-0/+0
|/ / / / / /
* | | | | | am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and ↵Dan Egnor2010-08-060-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| * | | | | Merge "COMMENT ONLY change to fix some formatting glitches and (more ↵Dan Egnor2010-08-060-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | importantly) clarify issues surrounding removed accounts." into froyo
* | \ \ \ \ \ Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbreadAndreas Huber2010-08-060-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Slight improvement (hopefully) to orientation sensing." into gingerbreadSteve Howard2010-08-060-0/+0
|\ \ \ \ \ \ \ \
* | | | | | | | | Merge "Adding a way for Hierarchy Viewer to get the focused window." into ↵Konstantin Lopyrev2010-08-060-0/+0
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | gingerbread
* | | | | | | | Fix String8::operator+Kenny Root2010-08-063-4/+80
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LHS was ignored when using: String8 + String8 String8 + (const char*) Add unit tests for above. Bug: 2898473 Change-Id: Ic8fe7be668b665c36aaaa3fc3c3ffdfff0fbba25
* | | | | | | Merge "Revert "Revert "Move SIP telephony related codes to framework.""" ↵Chung-yih Wang2010-08-050-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
* \ \ \ \ \ \ \ Merge "Add SIP service into system server." into gingerbreadChung-yih Wang2010-08-050-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ am 90937179: (-s ours) Merge "DO NOT MERGE Fix a bug that could cause flings ↵Adam Powell2010-08-050-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using ↵Adam Powell2010-08-050-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a Scroller" into froyo
* | \ \ \ \ \ \ \ \ am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the ↵Fred Quintana2010-08-050-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation of Account.toString()" into froyo Merge commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread * commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39': Changed SyncOperation.toKey() to not rely on the implementation of
| * | | | | | | | Merge "Changed SyncOperation.toKey() to not rely on the implementation of ↵Fred Quintana2010-08-050-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account.toString()" into froyo
* | \ \ \ \ \ \ \ \ Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbreadVasu Nori2010-08-050-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ am 005e2400: Merge "fix xml sample error" into froyoScott Main2010-08-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread * commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c': fix xml sample error
| * | | | | | | | | Merge "fix xml sample error" into froyoScott Main2010-08-050-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | / / / / | | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyoEric Rowe2010-08-050-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread * commit '982f1521a662d274eca1216707d874f148396ac6': Checkin initial bluetooth stress tests.
| * | | | | | | | Merge "Checkin initial bluetooth stress tests." into froyoEric Rowe2010-08-050-0/+0
| |/ / / / / / /
* | | | | | | | Merge "Use the target color format from the camera source if possible" into ↵James Dong2010-08-050-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | gingerbread
* | | | | | | | Merge "Fix an issue where the track duration does not include the last ↵James Dong2010-08-050-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | sample duration" into gingerbread
* | | | | | | | Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbreadBrian Carlstrom2010-08-050-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Better support for fake timestamps in RTP, H.263 video now also ↵Andreas Huber2010-08-050-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | requests FIR." into gingerbread
* \ \ \ \ \ \ \ Merge "A better fix for the OggExtractor referring to the sample rate while ↵Andreas Huber2010-08-050-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | it hasn't been initialized yet." into gingerbread