OSDN Git Service
Romain Guy [Tue, 26 Apr 2011 22:35:27 +0000 (15:35 -0700)]
Merge "Apply shaders/filters to text drop shadows. Bug #
4318323"
Romain Guy [Tue, 26 Apr 2011 21:04:59 +0000 (14:04 -0700)]
Merge "Update shader text to test with drop shadows."
Stephen Hines [Tue, 26 Apr 2011 20:45:51 +0000 (13:45 -0700)]
Merge "Start ICS header cleanup and finish type matrix."
Kenny Root [Tue, 26 Apr 2011 19:46:04 +0000 (12:46 -0700)]
am
fbb0e9f9: am
bb93dad9: am
bb10986c: am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
fbb0e9f9846e185ba8ded63d754c4e61b1499b90':
libutils: Fix an improper const-cast in RefBase
Jean-Baptiste Queru [Tue, 26 Apr 2011 19:45:52 +0000 (12:45 -0700)]
am
31418a1e: am
45e13ec1: am
5fcfce96: am
4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '
31418a1e9b905593587d8bf7a4705429db549d97':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Irfan Sheriff [Tue, 26 Apr 2011 19:45:28 +0000 (12:45 -0700)]
am
4e1027e4: am
78d4e71d: (-s ours) am
d2127c43: Handle DHCP renewal and wakeup in framework
* commit '
4e1027e45dbe292b1bdcbd3500b20f00618303f4':
Handle DHCP renewal and wakeup in framework
Scott Main [Tue, 26 Apr 2011 19:45:15 +0000 (12:45 -0700)]
am
1786fdda: am
e20c91de: am
e1e3d7d9: am
97fee855: docs: update a couple usb driver URLs bug:
4339758
* commit '
1786fddabeeffcceede702005839d9544188bc33':
docs: update a couple usb driver URLs bug:
4339758
Eric Laurent [Tue, 26 Apr 2011 19:44:53 +0000 (12:44 -0700)]
am
48dca4de: am
969357e3: am
223995dc: Fix issue
4335692: HDMI media volume
* commit '
48dca4de70890d324b5830a58bb9fa273164151a':
Fix issue
4335692: HDMI media volume
Kenny Root [Tue, 26 Apr 2011 18:45:46 +0000 (11:45 -0700)]
am
bb93dad9: am
bb10986c: am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930':
libutils: Fix an improper const-cast in RefBase
Kenny Root [Tue, 26 Apr 2011 18:41:31 +0000 (11:41 -0700)]
am
bb10986c: am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
bb10986c3d7493eaa3cd16042c8e6dae4769a071':
libutils: Fix an improper const-cast in RefBase
Kenny Root [Tue, 26 Apr 2011 18:32:22 +0000 (11:32 -0700)]
am
13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '
13ce221e4316f7956ba072e774a7b97646e5d99b':
libutils: Fix an improper const-cast in RefBase
Kenny Root [Tue, 26 Apr 2011 18:26:33 +0000 (11:26 -0700)]
Merge "libutils: Fix an improper const-cast in RefBase"
Jean-Baptiste Queru [Tue, 26 Apr 2011 17:24:27 +0000 (10:24 -0700)]
am
45e13ec1: am
5fcfce96: am
4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '
45e13ec1c5cd765162b7450b1c3a4632e8979894':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Marco Nelissen [Tue, 26 Apr 2011 16:37:57 +0000 (09:37 -0700)]
Merge "Fix javadoc."
John Reck [Tue, 26 Apr 2011 16:31:48 +0000 (09:31 -0700)]
Merge "Adding capability to lookup many elements."
Irfan Sheriff [Tue, 26 Apr 2011 15:54:54 +0000 (08:54 -0700)]
am
78d4e71d: (-s ours) am
d2127c43: Handle DHCP renewal and wakeup in framework
* commit '
78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9':
Handle DHCP renewal and wakeup in framework
Robert Greenwalt [Tue, 26 Apr 2011 08:35:39 +0000 (01:35 -0700)]
am
759efacd: am
ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
* commit '
759efacd2d1cf70d10f66fb9656de656ac8ca867':
Make new networkAttribute parameter non-optional.
Ramesh Sudini [Tue, 26 Apr 2011 08:35:20 +0000 (01:35 -0700)]
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."
Jean-Baptiste Queru [Tue, 26 Apr 2011 08:20:37 +0000 (01:20 -0700)]
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.
Scott Main [Tue, 26 Apr 2011 08:18:21 +0000 (01:18 -0700)]
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
Eric Laurent [Tue, 26 Apr 2011 08:14:07 +0000 (01:14 -0700)]
am
969357e3: am
223995dc: Fix issue
4335692: HDMI media volume
* commit '
969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
Fix issue
4335692: HDMI media volume
Scott Main [Tue, 26 Apr 2011 08:12:14 +0000 (01:12 -0700)]
am
e1e3d7d9: am
97fee855: docs: update a couple usb driver URLs bug:
4339758
* commit '
e1e3d7d97caf89307230e85997f5d23074b216cb':
docs: update a couple usb driver URLs bug:
4339758
Irfan Sheriff [Tue, 26 Apr 2011 08:01:31 +0000 (01:01 -0700)]
am
d2127c43: Handle DHCP renewal and wakeup in framework
* commit '
d2127c438fc858a4f6c8ad75b7a1e4491da69a78':
Handle DHCP renewal and wakeup in framework
Scott Main [Tue, 26 Apr 2011 07:45:35 +0000 (00:45 -0700)]
am
97fee855: docs: update a couple usb driver URLs bug:
4339758
* commit '
97fee8554d40a8c093ef16934284d9292e4cf7a4':
docs: update a couple usb driver URLs bug:
4339758
Jean-Baptiste Queru [Tue, 26 Apr 2011 07:39:44 +0000 (00:39 -0700)]
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.
Robert Greenwalt [Tue, 26 Apr 2011 07:23:03 +0000 (00:23 -0700)]
am
ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
* commit '
ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.
Ramesh Sudini [Tue, 26 Apr 2011 07:21:37 +0000 (00:21 -0700)]
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."
Eric Laurent [Tue, 26 Apr 2011 07:19:34 +0000 (00:19 -0700)]
am
223995dc: Fix issue
4335692: HDMI media volume
* commit '
223995dcf28aca2399258951a59559a7ae318ceb':
Fix issue
4335692: HDMI media volume
Mathias Agopian [Tue, 26 Apr 2011 05:59:51 +0000 (22:59 -0700)]
Merge "fix typo in Vector<>:: push_back and push_front"
Mathias Agopian [Tue, 26 Apr 2011 05:56:54 +0000 (22:56 -0700)]
fix typo in Vector<>:: push_back and push_front
parameter were inverted.
Change-Id: I867b01de5f58354bb9668fa662dd2a7d78dd3b37
James Dong [Tue, 26 Apr 2011 04:54:56 +0000 (21:54 -0700)]
Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
James Dong [Tue, 26 Apr 2011 04:54:46 +0000 (21:54 -0700)]
Merge "Fix memory leak from retrieval of getSupportedDrmInfo."
Fabrice Di Meglio [Tue, 26 Apr 2011 01:07:24 +0000 (18:07 -0700)]
Merge "Fix bug #
4338103 (Android Arabic and Hebrew input is broken)"
Adam Powell [Tue, 26 Apr 2011 00:44:22 +0000 (17:44 -0700)]
Merge "Action bar work for phones"
Mike Lockwood [Tue, 26 Apr 2011 00:42:39 +0000 (17:42 -0700)]
Merge "MTP: Implement GetThumb command"
Adam Powell [Tue, 26 Apr 2011 00:19:59 +0000 (17:19 -0700)]
Merge "Only set the accelerated drawable state for views when the hardware renderer is available."
Jamie Gennis [Tue, 26 Apr 2011 00:00:19 +0000 (17:00 -0700)]
Merge "EGL: Allow creating a SurfaceTexture EGLSurface."
Mathias Agopian [Mon, 25 Apr 2011 23:58:01 +0000 (16:58 -0700)]
Merge "libgui: Fix the tests so they build."
Jamie Gennis [Mon, 25 Apr 2011 23:41:11 +0000 (16:41 -0700)]
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
Jamie Gennis [Mon, 25 Apr 2011 23:40:05 +0000 (16:40 -0700)]
libgui: Fix the tests so they build.
Change-Id: I7205b0819e5801ac549109ff562c3ab1b113d176
Robert Greenwalt [Mon, 25 Apr 2011 23:19:30 +0000 (16:19 -0700)]
Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
Mathias Agopian [Mon, 25 Apr 2011 22:29:40 +0000 (15:29 -0700)]
Merge "Add some basic STL compatibility to Vector<>"
Mathias Agopian [Mon, 25 Apr 2011 22:28:17 +0000 (15:28 -0700)]
Add some basic STL compatibility to Vector<>
Change-Id: Iaf72623170ee415372c7989d7ba9ff627167449e
Robert Greenwalt [Mon, 25 Apr 2011 22:05:24 +0000 (15:05 -0700)]
Merge "Expose more net types to the public."
Chet Haase [Mon, 25 Apr 2011 21:51:48 +0000 (14:51 -0700)]
Merge "Minor cleanup in GLrenderer code"
Mike Lockwood [Mon, 25 Apr 2011 20:37:44 +0000 (13:37 -0700)]
Merge "MTP: Fix file descriptor leak in file editing extensions"
Jean-Baptiste Queru [Mon, 25 Apr 2011 20:33:37 +0000 (13:33 -0700)]
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
Chet Haase [Mon, 25 Apr 2011 19:56:34 +0000 (12:56 -0700)]
Merge "Fix bitfield bug with vertex shader selection"
James Dong [Mon, 25 Apr 2011 17:21:43 +0000 (10:21 -0700)]
Merge "Return status code from invoke()"
Mike Lockwood [Mon, 25 Apr 2011 16:52:26 +0000 (09:52 -0700)]
Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"
Mike Lockwood [Mon, 25 Apr 2011 16:52:10 +0000 (09:52 -0700)]
Merge "Remove log spam"
Eino-Ville Talvala [Mon, 25 Apr 2011 16:39:28 +0000 (09:39 -0700)]
Merge "Clarify the meaning of weight in the focus and metering area HAL."
Brian Carlstrom [Sun, 24 Apr 2011 04:01:35 +0000 (21:01 -0700)]
Merge "Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult"
Mike Lockwood [Sat, 23 Apr 2011 15:56:11 +0000 (08:56 -0700)]
Merge "Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE""
Mike Lockwood [Sat, 23 Apr 2011 15:55:59 +0000 (08:55 -0700)]
Merge "MTP: Add extended operations to support in-place editing of files"
Svetoslav Ganov [Sat, 23 Apr 2011 01:33:09 +0000 (18:33 -0700)]
Merge "Touch exploration feature, event bubling, refactor"
David Li [Sat, 23 Apr 2011 01:22:40 +0000 (18:22 -0700)]
Merge "GLES2Dbg: noop - format & comment"
Adam Powell [Sat, 23 Apr 2011 00:30:46 +0000 (17:30 -0700)]
Merge "Revert "Touch exploration feature, event bubling, refactor""
Joe Fernandez [Sat, 23 Apr 2011 00:30:10 +0000 (17:30 -0700)]
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
Freeman Ng [Sat, 23 Apr 2011 00:29:51 +0000 (17:29 -0700)]
am
1e2e390f: am
3b9089c1: new LTE prepay related values
* commit '
1e2e390fc715ef0aa264f4706fabde1a157668fc':
new LTE prepay related values
Jason Sams [Fri, 22 Apr 2011 23:56:49 +0000 (16:56 -0700)]
Merge "Add matrix logging."
Fabrice Di Meglio [Fri, 22 Apr 2011 23:54:37 +0000 (16:54 -0700)]
Merge "Clean getTextRunAdvances() APIs"
Joe Fernandez [Fri, 22 Apr 2011 23:48:44 +0000 (16:48 -0700)]
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
Freeman Ng [Fri, 22 Apr 2011 23:46:52 +0000 (16:46 -0700)]
am
3b9089c1: new LTE prepay related values
* commit '
3b9089c1fa6970974fa5234dfea46455811c8c7a':
new LTE prepay related values
Joe Fernandez [Fri, 22 Apr 2011 23:46:37 +0000 (16:46 -0700)]
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
Adam Powell [Fri, 22 Apr 2011 23:46:10 +0000 (16:46 -0700)]
Merge "Framework: fixed bug in multiselectlistpreference."
Joe Fernandez [Fri, 22 Apr 2011 23:36:33 +0000 (16:36 -0700)]
am
a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug
4293013
* commit '
a29e2cca5d0e3ff222c09165fd69ca8f4d0f634e':
docs: Fixing Issue with code for Adding Tabs topic bug
4293013
Svetoslav Ganov [Fri, 22 Apr 2011 23:29:07 +0000 (16:29 -0700)]
Merge "Touch exploration feature, event bubling, refactor"
Adam Powell [Fri, 22 Apr 2011 22:43:21 +0000 (15:43 -0700)]
Merge "Fix a bug when showing the menu panel with an action bar/menu items present."
Jason Sams [Fri, 22 Apr 2011 22:29:22 +0000 (15:29 -0700)]
Merge "Fix rsRand(float, float)"
Gilles Debunne [Fri, 22 Apr 2011 21:42:55 +0000 (14:42 -0700)]
Merge "Refactoring in TextViews' handles"
Alex Sakhartchouk [Fri, 22 Apr 2011 20:52:32 +0000 (13:52 -0700)]
Merge "sped up the ui in image processing test app"
Eric Fischer [Fri, 22 Apr 2011 19:31:02 +0000 (12:31 -0700)]
Merge "Import revised translations."
hongteng [Fri, 22 Apr 2011 19:28:39 +0000 (12:28 -0700)]
Merge "Fix for issue
3385135 "source code cleanup" engine part - remove the unused header files"
Dianne Hackborn [Fri, 22 Apr 2011 18:37:25 +0000 (11:37 -0700)]
Merge "Start work on simulating landscape/portrait when orientation is locked."
Brian Carlstrom [Fri, 22 Apr 2011 18:29:28 +0000 (11:29 -0700)]
Merge "Adding KeyChain API and IKeyChainService"
Josh Stone [Fri, 22 Apr 2011 18:13:35 +0000 (11:13 -0700)]
libutils: Fix an improper const-cast in RefBase
Under Fedora 15 Beta, gcc 4.6.0 warns:
frameworks/base/libs/utils/RefBase.cpp: In member function
‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]
trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.
Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
Shyam Pallapothu [Fri, 22 Apr 2011 02:59:17 +0000 (19:59 -0700)]
Merge "Fix for issue
4133431 "Remove OSAL layer" in JNI part"
Scott Main [Fri, 22 Apr 2011 00:43:52 +0000 (17:43 -0700)]
am
66140cc1: am
a2c180a0: am
caf60ebd: am
48c187f9: docs: fix typo in 3.0 notes
* commit '
66140cc1eadce6de4370d1078172e1a7eca6b919':
docs: fix typo in 3.0 notes
Scott Main [Fri, 22 Apr 2011 00:42:25 +0000 (17:42 -0700)]
am
a2c180a0: am
caf60ebd: am
48c187f9: docs: fix typo in 3.0 notes
* commit '
a2c180a0dde842d76d75c8b22ee7db29b482757e':
docs: fix typo in 3.0 notes
Scott Main [Fri, 22 Apr 2011 00:39:30 +0000 (17:39 -0700)]
am
caf60ebd: am
48c187f9: docs: fix typo in 3.0 notes
* commit '
caf60ebdbdf9769624f17395aabac4cf11ee130d':
docs: fix typo in 3.0 notes
Scott Main [Fri, 22 Apr 2011 00:36:40 +0000 (17:36 -0700)]
am
48c187f9: docs: fix typo in 3.0 notes
* commit '
48c187f9cf2bcb51f446a5a62346f9ef5920c7f3':
docs: fix typo in 3.0 notes
Dianne Hackborn [Fri, 22 Apr 2011 00:34:22 +0000 (17:34 -0700)]
Merge "Fix bug in deciding which rotation to use for an orientation."
Gilles Debunne [Fri, 22 Apr 2011 00:20:58 +0000 (17:20 -0700)]
Merge "Extracted WordIterator class."
Mathias Agopian [Fri, 22 Apr 2011 00:14:18 +0000 (17:14 -0700)]
Merge "Get rid of the "pid" parameter from createSurface"
Fabrice Di Meglio [Thu, 21 Apr 2011 23:27:56 +0000 (16:27 -0700)]
Merge "TextLayout cache - update size and improve logging"
Dianne Hackborn [Thu, 21 Apr 2011 23:10:28 +0000 (16:10 -0700)]
Merge "Rework display size access."
Dianne Hackborn [Thu, 21 Apr 2011 23:07:04 +0000 (16:07 -0700)]
Merge "Remove config_caseSensitiveExternalStorage; no longer needed."
Jason Sams [Thu, 21 Apr 2011 22:12:25 +0000 (15:12 -0700)]
Merge "Move TLS behind hal."
Jack Palevich [Thu, 21 Apr 2011 22:11:36 +0000 (15:11 -0700)]
Merge "Add utility method Matrix.perspectiveM"
Jesse Wilson [Thu, 21 Apr 2011 21:55:37 +0000 (14:55 -0700)]
Merge "Pool strings in JsonReader."
Adam Powell [Thu, 21 Apr 2011 21:51:24 +0000 (14:51 -0700)]
Merge "Fix bug
4329016 - Refresh menus properly while in batch update mode"
David Li [Thu, 21 Apr 2011 21:15:10 +0000 (14:15 -0700)]
GLES2Dbg: noop - format & comment
Change-Id: Ibb36508181d4322e236b6595b28d253f282c36d7
Signed-off-by: David Li <davidxli@google.com>
Chet Haase [Thu, 21 Apr 2011 18:52:59 +0000 (11:52 -0700)]
Merge "Enable anti-aliasing for hw-accelerated lines"
Scott Main [Thu, 21 Apr 2011 17:59:33 +0000 (10:59 -0700)]
am
a23ae0d7: am
69ccfd7a: am
ca7f30eb: am
b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit '
a23ae0d7be890b7590a87891b894a30f25bbd3ef':
docs: add a little info to Configuration class description
Scott Main [Thu, 21 Apr 2011 17:57:10 +0000 (10:57 -0700)]
am
69ccfd7a: am
ca7f30eb: am
b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit '
69ccfd7a29fc492c25dcb96dc74daf2e900118f5':
docs: add a little info to Configuration class description
Scott Main [Thu, 21 Apr 2011 17:55:20 +0000 (10:55 -0700)]
am
ca7f30eb: am
b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit '
ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83':
docs: add a little info to Configuration class description
Scott Main [Thu, 21 Apr 2011 17:53:08 +0000 (10:53 -0700)]
am
b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
* commit '
b8a57841316171d6db4311a65914720213516153':
docs: add a little info to Configuration class description
Scott Main [Thu, 21 Apr 2011 17:51:14 +0000 (10:51 -0700)]
Merge "docs: add a little info to Configuration class description" into honeycomb
Andy McFadden [Thu, 21 Apr 2011 17:45:47 +0000 (10:45 -0700)]
Merge "Calendar DB upgrade"
OSDN Git Service
