Gloria Wang
b340b3a22b
Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."
2011-06-21 13:19:36 -07:00
Xavier Ducrohet
25bc0a8146
Merge "Add missing delegate to the layoutlib."
2011-06-21 12:19:07 -07:00
Andreas Huber
0a37beb8df
Merge "Don't assert on malformed .mp4 content that contains fewer samples than"
2011-06-21 12:13:41 -07:00
James Dong
7457062692
Merge "Boost software vp8 decoder performance using multi-threaded decoding if possible"
2011-06-21 12:12:06 -07:00
Andreas Huber
950ba96ad3
Merge "Parse the individual segment's duration as a floating point number which is now"
2011-06-21 12:07:47 -07:00
Daniel Sandler
67eb5be994
Merge "Fix statusbar crash when DeskClock alarms go off."
2011-06-21 11:55:13 -07:00
Jaikumar Ganesh
50cf4a338d
Merge "Fix crash during unpair."
2011-06-21 11:44:32 -07:00
Christopher Tate
2fee5ddf10
Merge "Pass the data fd number as a command line argument to 'bu'"
2011-06-21 11:40:48 -07:00
Jaikumar Ganesh
43352460fb
Merge "Fix failure of Opp."
2011-06-21 11:37:47 -07:00
Brett Chabot
04c5ef6894
Merge "Include testdata in layoutlib-tests."
2011-06-21 11:27:29 -07:00
Gilles Debunne
05fee3b28e
Merge "Support for arbitrary ListAdapter in PreferenceActivity."
2011-06-21 11:16:35 -07:00
Ben Murdoch
7de9bebbcd
Merge changes I465dd712,Ifd607b0c
...
* changes:
Update Android DRT skip list.
LayoutTests with dumpAsText in the pathname should always dump as text.
2011-06-21 10:14:16 -07:00
Philip Milne
b07d9f6e32
Merge "Accomodate margins in child measurements."
2011-06-21 10:13:15 -07:00
Andreas Huber
991b455ddb
Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error."
2011-06-21 08:36:51 -07:00
Mike Lockwood
4870d23769
Merge "MTP: Add support for PTP variant of GetDeviceInfo result."
2011-06-21 05:30:02 -07:00
Svetoslav Ganov
f43864ca26
Merge "ListView do not fire accessibility hover events."
2011-06-20 21:52:31 -07:00
Wu-cheng Li
850403a777
Merge "Fix camera getMeteringAreas does not return areas correctly."
2011-06-20 21:20:32 -07:00
Jim Miller
f1880623dc
Merge "Handle dropped motion events in MultiWaveView due to high system activity"
2011-06-20 20:58:44 -07:00
David Brown
5e494d0816
Merge "Use a static flag to enable/disable CallerInfo "geoDescription" lookup"
2011-06-20 19:20:46 -07:00
Mike Lockwood
cadad410a3
Merge "USB: Make MTP/PTP toggle in the USB preferences set the default mode"
2011-06-20 18:56:26 -07:00
Adam Powell
b6674fbe73
Merge "Don't draw a middle divider on the first visible view."
2011-06-20 18:29:25 -07:00
Scott Main
397183277d
Merge "cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 docs: fix typos"
2011-06-20 17:59:05 -07:00
Fabrice Di Meglio
c1b2f8cf21
Merge "Update BiDiTest app for adding more unit tests"
2011-06-20 17:56:07 -07:00
Dianne Hackborn
563b9a5727
Merge "Stop the holo tabs from sqeezing in to each other."
2011-06-20 17:48:03 -07:00
Jason Sams
dad4817f3b
Merge "First cut at RSTextureView."
2011-06-20 17:26:48 -07:00
Adam Powell
3b174c0fe4
Merge "Fix bug 4738084 - Padding calculation regression"
2011-06-20 17:15:45 -07:00
Bill Napier
30e2ad1a83
Merge "Fixed MonkeyRunner documentation"
2011-06-20 16:35:30 -07:00
Mike Lockwood
00fdba57c6
Merge "Tethering: Use UsbManager to enable/disable RNDIS"
2011-06-20 16:27:12 -07:00
Andreas Huber
a653989d8b
Merge "OGG: To prevent mediaserver from crash by SIGFPE (divide by zero) and more guarding in getMetaData()."
2011-06-20 16:08:06 -07:00
Ying Wang
1650bd4d31
Merge "Output Proguard options for also overlay layouts."
2011-06-20 16:06:51 -07:00
Eric Fischer
9bf8f24dc9
Merge "Import revised translations."
2011-06-20 16:02:21 -07:00
Nick Pelly
f5e32c85b6
am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.
...
* commit '6f1a8edcc00db40a8ad300e15a23f7f1de298c3b':
NFC Adapter Extras API update.
2011-06-20 15:58:40 -07:00
Nick Pelly
64c4f89c5b
am 17523abb: NFC Adapter Extras API update.
...
* commit '17523abb45b7f77f35af53e895d74be13f2314e0':
NFC Adapter Extras API update.
2011-06-20 15:54:07 -07:00
Jamie Gennis
c8c5152b19
SurfaceTexture: make tests use a large framebuffer.
...
This change makes the SurfaceTexture GL tests use a large (512x512)
framebuffer. The tests now use glViewport to render to a region of the
framebuffer with a size matching that of the texture being drawn. The
Npot test pixel checks must be changed because now the rendered region
is the same size as the texture.
Change-Id: Icc41803189c25e33ba1da7d2470720f0a11f3e4b
2011-06-20 15:42:57 -07:00
Jamie Gennis
b36bb97ae3
Merge "SurfaceTexture: fix a NULL ptr dereference."
2011-06-20 15:34:00 -07:00
Jamie Gennis
1c4414091c
SurfaceTexture: fix a NULL ptr dereference.
...
This change adds a NULL check when searching the slot list in
SurfaceTextureClient for the slot corresponding to a buffer being
queued or canceled.
Bug: 4645023
Change-Id: I806cbc1e34da118ea33a83c4f25ce8193ba1c3ad
2011-06-20 14:16:49 -07:00
James Dong
24f3ebb275
Merge "When a recording session is stopped, no outstanding input video frames exist for the output buffers returned from OMX component to SF."
2011-06-20 13:23:14 -07:00
Conley Owens
370377fd35
am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
...
* commit 'c1b62e3ba91d69dd75569b480aec55be8f808331':
Check if we are in daylight time when calculating timezone
2011-06-20 13:20:49 -07:00
Adam Powell
25e4ecf3c7
Merge "Match legacy theme colors with gingerbread"
2011-06-20 13:07:39 -07:00
Conley Owens
1894fc2765
am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
...
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
Check if we are in daylight time when calculating timezone
2011-06-20 13:04:45 -07:00
Robert Greenwalt
af68797872
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
...
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -07:00
Eric Fischer
44ba2e4834
Merge "Add map center resources for new locales."
2011-06-20 12:03:01 -07:00
Stephen Hines
5691e05276
Merge "Add support for more vector types to RS."
2011-06-20 12:00:50 -07:00
Jamie Gennis
72ad7b42af
Merge "SurfaceTexture: attach to Dalvik when needed."
2011-06-20 11:54:34 -07:00
Robert Greenwalt
05bfbc458c
Merge "Fix tethering upstream determination." into honeycomb-LTE
2011-06-20 11:47:49 -07:00
Fabrice Di Meglio
cb046f30d7
Merge "Add View paddingStart and paddingEnd"
2011-06-20 11:35:36 -07:00
Nick Pelly
db829c382c
Merge "Parser for uri records"
2011-06-20 11:32:28 -07:00
Philip Milne
57d46519aa
Merge "Ensure measuredWidth > getSuggestedMinimumWidth(), same for height."
2011-06-20 11:12:38 -07:00
Conley Owens
a77ed0e5f6
Merge "Check if we are in daylight time when calculating timezone"
2011-06-20 11:01:41 -07:00
Robert Ly
5292656c7a
am d1a19b10: am c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
...
* commit 'd1a19b10ef0bb0369fa7ed9a16fb8f8d6320e05f':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
2011-06-20 09:51:08 -07:00