Commit Graph

33279 Commits

Author SHA1 Message Date
Mathias Agopian
cc57d6f883 Fix uninitialized variable in SurfaceTexture
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
2011-04-27 18:58:46 -07:00
Adam Powell
2cb34a41f1 Merge "Fix overlay action bar decor layout for lower context mode area." 2011-04-26 18:38:23 -07:00
Nick Pelly
a6bb1444ab am 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
* commit '3fa53e448a4b2255f6ed14f8b8355ac2ee3379e9':
  Implement dead service recovery in NFC extras library.
2011-04-26 18:11:02 -07:00
Nick Pelly
e8e764a417 am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
  Implement dead service recovery in NFC extras library.
2011-04-26 18:09:02 -07:00
Mathias Agopian
0ea7d61fa1 Merge "Report errors when eglCreateImageKHR fails" 2011-04-26 18:05:23 -07:00
Nick Pelly
4dd1b75e82 am cc9ee72b: Implement dead service recovery in NFC extras library.
* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
  Implement dead service recovery in NFC extras library.
2011-04-26 18:04:02 -07:00
Xia Wang
a88c78d995 Merge "- Add instrumentation utility to automate rs performance tests: The RsBench test activity can be launched within instrumentation" 2011-04-26 17:03:05 -07:00
Eric Fischer
9ce609a6f1 Merge "Import revised translations." 2011-04-26 16:19:04 -07:00
Conley Owens
5dbfc3b32c am ca15bf7a: am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit 'ca15bf7ae0e55057d3eafabe5f97fe81bb3dcf26':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 16:06:19 -07:00
Conley Owens
8365cd27bc am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit '54a952c84317afc64034ded8baad3d788a54026d':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 16:01:13 -07:00
Conley Owens
93d0d8663d am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 15:50:33 -07:00
Conley Owens
7f4b15761b am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit '17ba30b549a847f3aab854173a9484851f694453':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 15:46:32 -07:00
Romain Guy
74d72d46f2 Merge "Apply shaders/filters to text drop shadows. Bug #4318323" 2011-04-26 15:35:27 -07:00
Mathias Agopian
3cd5a11708 Report errors when eglCreateImageKHR fails
Change-Id: Ica39b72ac2505675e619ef4994bd67b98bf6e7da
2011-04-26 15:03:27 -07:00
Conley Owens
2d904f106b Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 2011-04-26 14:36:48 -07:00
Romain Guy
40b2edf77f Merge "Update shader text to test with drop shadows." 2011-04-26 14:04:59 -07:00
Stephen Hines
74f80609af Merge "Start ICS header cleanup and finish type matrix." 2011-04-26 13:45:51 -07:00
Kenny Root
7e002d9a3f 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
2011-04-26 12:46:04 -07:00
Jean-Baptiste Queru
ee3098ecb8 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.
2011-04-26 12:45:52 -07:00
Irfan Sheriff
943e404af4 am 4e1027e4: am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework
* commit '4e1027e45dbe292b1bdcbd3500b20f00618303f4':
  Handle DHCP renewal and wakeup in framework
2011-04-26 12:45:28 -07:00
Scott Main
8ecddba5c0 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
2011-04-26 12:45:15 -07:00
Eric Laurent
0833345ef3 am 48dca4de: am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
* commit '48dca4de70890d324b5830a58bb9fa273164151a':
  Fix issue 4335692: HDMI media volume
2011-04-26 12:44:53 -07:00
Kenny Root
f3faf0bc3d 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
2011-04-26 11:45:46 -07:00
Kenny Root
dd3718af90 am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
  libutils: Fix an improper const-cast in RefBase
2011-04-26 11:41:31 -07:00
Kenny Root
b5e7f05190 am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
  libutils: Fix an improper const-cast in RefBase
2011-04-26 11:32:22 -07:00
Kenny Root
c364113a1b Merge "libutils: Fix an improper const-cast in RefBase" 2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
62d9009da1 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.
2011-04-26 10:24:27 -07:00
Marco Nelissen
90cd4e790d Merge "Fix javadoc." 2011-04-26 09:37:57 -07:00
John Reck
c7b7d378a5 Merge "Adding capability to lookup many elements." 2011-04-26 09:31:48 -07:00
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