John Reck
4ddb7ab862
Merge "Adding capability to lookup many elements."
2011-04-26 09:31:48 -07:00
Irfan Sheriff
4e1027e45d
am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework
...
* commit '78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9':
Handle DHCP renewal and wakeup in framework
2011-04-26 08:54:54 -07:00
Robert Greenwalt
7460591a57
am 759efacd: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit '759efacd2d1cf70d10f66fb9656de656ac8ca867':
Make new networkAttribute parameter non-optional.
2011-04-26 01:35:39 -07:00
Ramesh Sudini
bfc57acdb8
am 9d5ac7bd: am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."
...
* commit '9d5ac7bd8ac92ac8fda2e1ac500438ffe6e3aa0f':
Telephony: Fix merge issue "Set enabled state before notification is sent out."
2011-04-26 01:35:20 -07:00
Jean-Baptiste Queru
45e13ec1c5
am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 01:20:37 -07:00
Scott Main
1786fddabe
am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758
...
* commit 'e20c91de9ccb4a8cb76a8e72884f2e9ca001a2de':
docs: update a couple usb driver URLs bug: 4339758
2011-04-26 01:18:21 -07:00
Eric Laurent
48dca4de70
am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
...
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
Fix issue 4335692: HDMI media volume
2011-04-26 01:14:07 -07:00
Scott Main
e20c91de9c
am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758
...
* commit 'e1e3d7d97caf89307230e85997f5d23074b216cb':
docs: update a couple usb driver URLs bug: 4339758
2011-04-26 01:12:14 -07:00
Irfan Sheriff
78d4e71dec
am d2127c43: Handle DHCP renewal and wakeup in framework
...
* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
Handle DHCP renewal and wakeup in framework
2011-04-26 01:01:31 -07:00
Scott Main
e1e3d7d97c
am 97fee855: docs: update a couple usb driver URLs bug: 4339758
...
* commit '97fee8554d40a8c093ef16934284d9292e4cf7a4':
docs: update a couple usb driver URLs bug: 4339758
2011-04-26 00:45:35 -07:00
Jean-Baptiste Queru
5fcfce965f
am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 00:39:44 -07:00
Robert Greenwalt
759efacd2d
am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.
2011-04-26 00:23:03 -07:00
Ramesh Sudini
9d5ac7bd8a
am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."
...
* commit 'dcbba67afc08d0ac9af53e95d5997af11f869853':
Telephony: Fix merge issue "Set enabled state before notification is sent out."
2011-04-26 00:21:37 -07:00
Eric Laurent
969357e31c
am 223995dc: Fix issue 4335692: HDMI media volume
...
* commit '223995dcf28aca2399258951a59559a7ae318ceb':
Fix issue 4335692: HDMI media volume
2011-04-26 00:19:34 -07:00
Mathias Agopian
88eb5c07f5
Merge "fix typo in Vector<>:: push_back and push_front"
2011-04-25 22:59:51 -07:00
Mathias Agopian
1d38d936a1
fix typo in Vector<>:: push_back and push_front
...
parameter were inverted.
Change-Id: I867b01de5f58354bb9668fa662dd2a7d78dd3b37
2011-04-25 22:59:07 -07:00
James Dong
a277c4328f
Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
2011-04-25 21:54:56 -07:00
James Dong
d0244575df
Merge "Fix memory leak from retrieval of getSupportedDrmInfo."
2011-04-25 21:54:46 -07:00
Fabrice Di Meglio
9b33461384
Merge "Fix bug #4338103 (Android Arabic and Hebrew input is broken)"
2011-04-25 18:07:24 -07:00
Fabrice Di Meglio
589e4e27ee
Fix bug #4338103 (Android Arabic and Hebrew input is broken)
...
- fix glyph order when there is only a single run
- update tests
Change-Id: I113f28a8c76cab622fb75ce84bc50d1d38fa254e
2011-04-25 17:48:55 -07:00
Adam Powell
c404c4fbc1
Merge "Action bar work for phones"
2011-04-25 17:44:22 -07:00
Adam Powell
dae7824c4b
Action bar work for phones
...
Drop tabs to a second row at < w480dp
Make 9-patches for the cab's "done" button thinner
Add a "disable home" display option to the action bar to turn off
focus and touch feedback when tapping home would do nothing
Change-Id: Ib2eedf311655f02055357321e2e9ad5b9037fed1
2011-04-25 17:42:45 -07:00
Mike Lockwood
fbfb7e50c9
Merge "MTP: Implement GetThumb command"
2011-04-25 17:42:39 -07:00
Mike Lockwood
c89f22242b
MTP: Implement GetThumb command
...
This allows the PC to access thumbnails in JPEG files over MTP/PTP
Bug: 3219495
Change-Id: I4964f8b4826dffb7f0f77464ec91bd2e97a2f007
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-25 17:40:33 -07:00
Adam Powell
641e093f28
Merge "Only set the accelerated drawable state for views when the hardware renderer is available."
2011-04-25 17:19:59 -07:00
Jamie Gennis
84baa7f639
Merge "EGL: Allow creating a SurfaceTexture EGLSurface."
2011-04-25 17:00:19 -07:00
Mathias Agopian
9e797784d5
Merge "libgui: Fix the tests so they build."
2011-04-25 16:58:01 -07:00
Jamie Gennis
7868c64fff
EGL: Allow creating a SurfaceTexture EGLSurface.
...
This change removes the check that disallowed the creation of an
EGLSurface that would send frames to a SurfaceTexture.
Change-Id: I44c6d5df503cc676a88144d72d39b414692ce4c9
2011-04-25 16:41:11 -07:00
Jamie Gennis
5dbf2ed575
libgui: Fix the tests so they build.
...
Change-Id: I7205b0819e5801ac549109ff562c3ab1b113d176
2011-04-25 16:40:05 -07:00
Robert Greenwalt
ef568c97b5
Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
2011-04-25 16:19:30 -07:00
Jason Sams
6cc888e77e
Start ICS header cleanup and finish type matrix.
...
Change-Id: If65f96f08c958d330862c543d85dd9d4a0f90e06
2011-04-25 16:09:48 -07:00
Robert Greenwalt
af2eb4f6db
Make new networkAttribute parameter non-optional.
...
Dependencymet sets the default dep-met value for the network. Should
be set to true unless you know what you're doing.
Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
2011-04-25 16:04:45 -07:00
Adam Powell
5a7e94ea89
Only set the accelerated drawable state for views when the hardware
...
renderer is available.
Change-Id: I5bcf2068771d47604e12a44e1ab870fa4c69fb4c
2011-04-25 15:30:43 -07:00
Mathias Agopian
46baa14f27
Merge "Add some basic STL compatibility to Vector<>"
2011-04-25 15:29:40 -07:00
Mathias Agopian
589b64a64b
Add some basic STL compatibility to Vector<>
...
Change-Id: Iaf72623170ee415372c7989d7ba9ff627167449e
2011-04-25 15:28:17 -07:00
Robert Greenwalt
7ada57f8ba
Merge "Expose more net types to the public."
2011-04-25 15:05:24 -07:00
Scott Main
97fee8554d
docs: update a couple usb driver URLs
...
bug: 4339758
Change-Id: I39357a0061312b189f50c296105cefe3862fc733
2011-04-25 14:53:03 -07:00
Chet Haase
1a2210ced1
Merge "Minor cleanup in GLrenderer code"
2011-04-25 14:51:48 -07:00
Chet Haase
6fca9884b3
Minor cleanup in GLrenderer code
...
Changed the way we use bitcodes for one of the rendering
options to make the code cleaner.
Change-Id: Ifaa965f228dbdad297a40da93bfbe63373986e35
2011-04-25 14:50:04 -07:00
Alex Sakhartchouk
e7c4a7565c
Modifying libRS internal communication to handle network rendering.
...
Change-Id: I8c8b3cc3402ecf4ba774e1d668dce25ff0af0e5a
2011-04-25 14:30:27 -07:00
Mike Lockwood
466e3a22db
Merge "MTP: Fix file descriptor leak in file editing extensions"
2011-04-25 13:37:44 -07:00
Mike Lockwood
1003199cb8
MTP: Fix file descriptor leak in file editing extensions
...
Change-Id: I6d0de5efe705d8060bbfd526c6880dc995a3aa30
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-25 13:36:11 -07:00
Eric Laurent
223995dcf2
Fix issue 4335692: HDMI media volume
...
Forced music stream volume to max when not muted and output device is HDMI.
Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13
2011-04-25 13:34:51 -07:00
Jean-Baptiste Queru
4b72eec34c
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
2011-04-25 13:33:37 -07:00
Chet Haase
cc5a7d2328
Merge "Fix bitfield bug with vertex shader selection"
2011-04-25 12:56:34 -07:00
Ramesh Sudini
dcbba67afc
Telephony: Fix merge issue "Set enabled state before notification is sent out."
...
The original change-id was I6e84920b8d082fd6da838bccb5333051362bc4bc
Change-Id: I758641f8b29346a868e1b6b454ccd3f2341dffb8
2011-04-25 11:30:32 -07:00
Marco Nelissen
eb6b9e649e
Fix javadoc.
...
Change-Id: I6de2ac39626cb8749a525c51234018986dd95969
2011-04-25 10:40:07 -07:00
James Dong
a13802d880
Merge "Return status code from invoke()"
2011-04-25 10:21:43 -07:00
Mike Lockwood
42f16f3d42
Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"
2011-04-25 09:52:26 -07:00
Mike Lockwood
e8fd99df6e
Merge "Remove log spam"
2011-04-25 09:52:10 -07:00