James Dong
ca901d984d
Merge "Handle large audio lost" into gingerbread
2010-08-12 10:07:51 -07:00
James Dong
ce49115a25
Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
2010-08-12 10:07:38 -07:00
James Dong
28988defd2
Merge "Fix all fd leaks in authoring engine" into gingerbread
2010-08-12 09:13:14 -07:00
Mathias Agopian
ce6d43a32a
Merge "should fix sim build, hopefully" into gingerbread
2010-08-11 17:32:25 -07:00
Mathias Agopian
f1352df47f
should fix sim build, hopefully
...
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
2010-08-11 17:31:33 -07:00
Jeff Brown
f2a67c067d
Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread
2010-08-11 17:22:17 -07:00
Mathias Agopian
e9ba52c9c3
Merge "call into hwcomposer HAL when present" into gingerbread
2010-08-11 16:24:46 -07:00
Mathias Agopian
dca13144a3
Merge "don't handle the transparent region of a layer in draw()" into gingerbread
2010-08-11 16:21:01 -07:00
Mathias Agopian
b5983b03fd
Merge "get rid of our LayerVector implementation" into gingerbread
2010-08-11 16:20:38 -07:00
Mathias Agopian
c726179839
Merge "keep a list of visible sorted surfaces" into gingerbread
2010-08-11 16:19:16 -07:00
Jeff Brown
2f09a77659
Merge "Add support for the PointerLocation overlay." into gingerbread
2010-08-11 16:15:48 -07:00
Mathias Agopian
a350ff9869
call into hwcomposer HAL when present
...
Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
2010-08-11 16:08:45 -07:00
Mathias Agopian
bc7e31a84b
don't handle the transparent region of a layer in draw()
...
this is already taken into consideration in computeVisibleRegion
and therefore not needed at draw time.
Change-Id: I3fc7336d22f1147dfcd3a20fd71bf79b946d971f
2010-08-11 16:05:06 -07:00
Mathias Agopian
f6679fc6f7
get rid of our LayerVector implementation
...
we now use SortedVector<> with a special compare implementation.
Change-Id: I910459cf3b3c8993b55ad0786a8c348369262de5
2010-08-11 16:05:05 -07:00
Mathias Agopian
4da7519993
keep a list of visible sorted surfaces
...
Change-Id: Ib815eeff894f8a3b1e79fbbf8186d5d91bb60285
2010-08-11 16:04:51 -07:00
Dianne Hackborn
0aa32b9dc9
Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
2010-08-11 15:16:01 -07:00
Jeff Brown
3f9ff2076c
Add support for the PointerLocation overlay.
...
This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications. The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).
Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
2010-08-11 14:46:32 -07:00
Kenny Root
b6acda2f80
Merge "Initial tool for OBB manipulation" into gingerbread
2010-08-11 14:06:51 -07:00
Kenny Root
cc440b377b
Merge "Move OBB file reading to DefaultContainerService" into gingerbread
2010-08-11 14:06:39 -07:00
Andreas Huber
58f81d841b
Merge "This code in CameraSource really should hold the lock." into gingerbread
2010-08-11 13:20:59 -07:00
Kenny Root
1dfd9f8a97
Initial tool for OBB manipulation
...
Add "obbtool" host command for adding, removing, and querying Opaque
Binary Blob (OBB) information from a file.
Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
2010-08-11 11:24:41 -07:00
Dianne Hackborn
76263ffc88
Merge "More native work." into gingerbread
2010-08-11 00:45:44 -07:00
Dianne Hackborn
c3ef3ae552
More native work.
...
Implement save/restore of state, and add native APIs for
configuration information.
Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
2010-08-11 00:29:59 -07:00
Hung-ying Tyan
5736292a1a
Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
2010-08-10 20:48:18 -07:00
Yu Shan Emily Lau
44582306d2
Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
2010-08-10 20:06:39 -07:00
Adam Powell
b351b3d6ac
Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067 " into gingerbread
2010-08-10 17:52:15 -07:00
Konstantin Lopyrev
336b9815ce
Merge "Categorizing exported view properties." into gingerbread
2010-08-10 17:48:27 -07:00
Jeff Brown
8d4dfd25f7
Fix safe mode and KeyEvent.getMaxKeyCode().
...
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
2010-08-10 16:28:03 -07:00
Jeff Brown
81a5c091ca
Merge "Optimize VelocityTracker to run in linear time." into gingerbread
2010-08-10 16:26:56 -07:00
Andreas Huber
d74731ce8d
Merge "Remove some obsolete code." into gingerbread
2010-08-10 14:09:39 -07:00
Mathias Agopian
4b149a598f
Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread
2010-08-10 13:50:22 -07:00
James Dong
166638b737
Merge "Add input buffer size check for software video encoders" into gingerbread
2010-08-10 13:27:09 -07:00
Andreas Huber
dd05839d2d
Merge "We're now going to ignore timestamps completely in gtalk video 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
2010-08-10 12:59:27 -07:00
Eric Fischer
ca71562968
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-10 11:54:24 -07:00
Eric Rowe
16f0555ca3
am 301c437b: Remove @LargeTest annotations
...
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread
* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
Remove @LargeTest annotations
2010-08-10 11:53:59 -07:00
Andreas Huber
73310bca96
Merge "Many, many developers misread or don't read the http specs and 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
2010-08-10 11:39:38 -07:00
James Dong
c4d25e70d6
Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
2010-08-10 10:41:29 -07:00
Brett Chabot
c3e4612796
Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread
2010-08-10 10:27:48 -07:00
Hung-ying Tyan
576b36e360
Merge "SIP: clean up unused class and fields." into gingerbread
2010-08-09 22:30:58 -07:00
Mathias Agopian
7f781d1552
improve a bit the implementation of eglGetProcAddress
...
Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
2010-08-09 18:35:43 -07:00
Jaikumar Ganesh
b5a3d0a150
Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
2010-08-09 17:30:25 -07:00
Konstantin Lopyrev
a06eec8660
Merge "Fix focus notification" into gingerbread
2010-08-09 17:03:10 -07:00
Konstantin Lopyrev
cbceb6f2f2
Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
2010-08-09 17:02:39 -07:00
Jean-Michel Trivi
c2fab76f69
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
2010-08-09 14:19:08 -07:00
Jaikumar Ganesh
4d021abf6c
Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
2010-08-09 13:50:28 -07:00
James Dong
f13b68e556
Merge "Support multiple PPS and SPS in avcC box" into gingerbread
2010-08-09 13:35:54 -07:00
Andreas Huber
daae89bc67
Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
2010-08-09 11:30:34 -07:00
Eric Laurent
df60362e87
Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
2010-08-09 10:42:27 -07:00
Dan Egnor
6f678531b9
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
2010-08-06 18:55:05 -07:00
Dan Egnor
df78a0982c
Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
2010-08-06 16:39:02 -07:00
