Irfan Sheriff
bb16d2f792
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
5308a8b50f
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
5697d2d45a
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
84199cac5d
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
b1002d9ec5
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
4e19d9ee2d
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
f350c5e7c7
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
6e218d3f06
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
bba61e6644
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
a89e25181f
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
64e6e9ef73
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
588823c28a
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
eaead44d23
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
77680e9273
Merge "fix typo in Vector<>:: push_back and push_front"
2011-04-25 22:59:51 -07:00
Mathias Agopian
d5b421aaa7
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
fbd00d6328
Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
2011-04-25 21:54:56 -07:00
James Dong
0eb90c1997
Merge "Fix memory leak from retrieval of getSupportedDrmInfo."
2011-04-25 21:54:46 -07:00
Fabrice Di Meglio
a3c4e6cf18
Merge "Fix bug #4338103 (Android Arabic and Hebrew input is broken)"
2011-04-25 18:07:24 -07:00
Adam Powell
0006864852
Merge "Action bar work for phones"
2011-04-25 17:44:22 -07:00
Mike Lockwood
8a10d516ee
Merge "MTP: Implement GetThumb command"
2011-04-25 17:42:39 -07:00
Adam Powell
a3a953253f
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
6c847f4052
Merge "EGL: Allow creating a SurfaceTexture EGLSurface."
2011-04-25 17:00:19 -07:00
Mathias Agopian
29e6c48cd1
Merge "libgui: Fix the tests so they build."
2011-04-25 16:58:01 -07:00
Jamie Gennis
1b528fb9d8
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
fc850124b3
libgui: Fix the tests so they build.
...
Change-Id: I7205b0819e5801ac549109ff562c3ab1b113d176
2011-04-25 16:40:05 -07:00
Robert Greenwalt
b7f462b9f7
Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
2011-04-25 16:19:30 -07:00
Mathias Agopian
92cf0ce426
Merge "Add some basic STL compatibility to Vector<>"
2011-04-25 15:29:40 -07:00
Mathias Agopian
e60e1fd23d
Add some basic STL compatibility to Vector<>
...
Change-Id: Iaf72623170ee415372c7989d7ba9ff627167449e
2011-04-25 15:28:17 -07:00
Robert Greenwalt
fe7b45477e
Merge "Expose more net types to the public."
2011-04-25 15:05:24 -07:00
Chet Haase
8a4ccee8db
Merge "Minor cleanup in GLrenderer code"
2011-04-25 14:51:48 -07:00
Mike Lockwood
79d22dfda7
Merge "MTP: Fix file descriptor leak in file editing extensions"
2011-04-25 13:37:44 -07:00
Jean-Baptiste Queru
26603203b6
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
2011-04-25 13:33:37 -07:00
Chet Haase
8e28b0534f
Merge "Fix bitfield bug with vertex shader selection"
2011-04-25 12:56:34 -07:00
James Dong
65fcadccbf
Merge "Return status code from invoke()"
2011-04-25 10:21:43 -07:00
Mike Lockwood
08dfde760f
Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"
2011-04-25 09:52:26 -07:00
Mike Lockwood
e757212c0d
Merge "Remove log spam"
2011-04-25 09:52:10 -07:00
Eino-Ville Talvala
44e301faf5
Merge "Clarify the meaning of weight in the focus and metering area HAL."
2011-04-25 09:39:28 -07:00
Brian Carlstrom
43fb20dfb6
Merge "Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult"
2011-04-23 21:01:35 -07:00
Mike Lockwood
57a2c88f6f
Merge "Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE""
2011-04-23 08:56:11 -07:00
Mike Lockwood
5ec0d0e5d5
Merge "MTP: Add extended operations to support in-place editing of files"
2011-04-23 08:55:59 -07:00
Svetoslav Ganov
fbc2fae31e
Merge "Touch exploration feature, event bubling, refactor"
2011-04-22 18:33:09 -07:00
David Li
086d075258
Merge "GLES2Dbg: noop - format & comment"
2011-04-22 18:22:40 -07:00
Adam Powell
f1c85cde0e
Merge "Revert "Touch exploration feature, event bubling, refactor""
2011-04-22 17:30:46 -07:00
Joe Fernandez
798024df38
am 7f90b316: am 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit '7f90b316b6731b6e8beb3babe71088d0d8bd3a57':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 17:30:10 -07:00
Freeman Ng
c7b130ee41
am 1e2e390f: am 3b9089c1: new LTE prepay related values
...
* commit '1e2e390fc715ef0aa264f4706fabde1a157668fc':
new LTE prepay related values
2011-04-22 17:29:51 -07:00
Jason Sams
86278771cd
Merge "Add matrix logging."
2011-04-22 16:56:49 -07:00
Fabrice Di Meglio
d74291bc18
Merge "Clean getTextRunAdvances() APIs"
2011-04-22 16:54:37 -07:00
Joe Fernandez
7b339d2592
am 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit '41f665a5f9d4e73ba8dabceb721c9c8873591bac':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:48:44 -07:00
Freeman Ng
62bc73e09e
am 3b9089c1: new LTE prepay related values
...
* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
new LTE prepay related values
2011-04-22 16:46:52 -07:00
Joe Fernandez
7d6a9fb6e2
am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit 'c84362a72ab958c4ffe34c16d8cf76883d48f0e8':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:46:37 -07:00