Commit Graph

43365 Commits

Author SHA1 Message Date
Mathias Agopian
cf701aa9fe remove unused code
Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
2012-01-28 18:47:13 -08:00
Jean-Baptiste Queru
0f10202085 am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '27d2ab8b27e7e1927e18869e898fa556e5da3d43':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 21:09:20 -08:00
Roman Nurik
c744989304 am 5525a43a: am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '5525a43a9c814faba22adfafc6517fb64259966f':
  docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-27 21:08:59 -08:00
Roman Nurik
0bbfe207e5 am 9d9c7189: am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d':
  docs: Update designing-navigation training class to link to Android Design
2012-01-27 21:08:50 -08:00
Jim Miller
88b750a32c Merge "Fix 5906830: Update the clock earlier when lock screen comes back from suspend." 2012-01-27 17:42:26 -08:00
Jeff Brown
e6ae2923ac Merge "Improve watchdog monitor for InputReader and InputDispatcher." 2012-01-27 17:37:31 -08:00
Jeff Brown
4db313480c Merge "Implement a cancelation mechanism for queries." 2012-01-27 17:37:24 -08:00
Siva Velusamy
0832fb6407 gltrace: Use Unix Domain Socket rather than INET Socket
Export trace information via abstract Unix Domain Socket (UDS).
This allows tracing of applications without INTERNET permission,
and should be faster as well.

Change-Id: Iabb67fcc2bc2484afd8128af07dca723b81c52c6
2012-01-27 17:24:18 -08:00
Jean-Michel Trivi
3207f28053 Merge "Bug 5567648 Request and abandon audio focus in calls" 2012-01-27 14:50:28 -08:00
Fabrice Di Meglio
ae458a09b7 Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE" 2012-01-27 14:42:06 -08:00
Jean-Michel Trivi
5eb1fe43bf Merge "Bug 5567648 disassociate audio mode and audio focus" 2012-01-27 14:15:37 -08:00
Glenn Kasten
c380de9f01 Merge "Remove optional LVMX service" 2012-01-27 14:11:16 -08:00
Jean-Baptiste Queru
de0c247336 am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:58:03 -08:00
Jean-Baptiste Queru
f08d07d93f am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '9781870491f4f33403f8d518879a88c20180d7cb':
  Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:55:56 -08:00
Gilles Debunne
a7eca5c0b8 Merge "Fix for IOOB when suggestions have disappeared" 2012-01-27 13:54:50 -08:00
Gilles Debunne
b8c47a870d Merge "Handle tap and move cursor before showing suggestions" 2012-01-27 13:54:42 -08:00
Teng-Hui Zhu
fb9a7fb032 Merge "Revert "Hack to workaround the fact that the EGL context can be"" 2012-01-27 13:48:25 -08:00
Jean-Baptiste Queru
2bc69de766 Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 2012-01-27 13:36:49 -08:00
Eric Fischer
09b12a30f6 Merge "Import translations. DO NOT MERGE" 2012-01-27 11:58:58 -08:00
Eric Fischer
dae7cb6bce Merge "Mark locale-neutral configuration strings translatable="false"" 2012-01-27 11:22:52 -08:00
Nick Pelly
c490675718 Merge "Fix doc bug." 2012-01-27 11:03:57 -08:00
Nick Pelly
fe3ebda60f Merge "Fix build: update current.txt" 2012-01-27 10:35:12 -08:00
Stephen Hines
084f76135b Merge "Don't wait forever if there are no commands to execute." 2012-01-27 10:08:18 -08:00
Nick Pelly
cbec2b18a3 Merge "Add NdefMessage.getByteLength(), and more minor fixes:" 2012-01-27 09:59:10 -08:00
Jamie Gennis
eebc37915c Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 2012-01-27 09:53:14 -08:00
Glenn Kasten
9313ab3af5 Merge "Use audio_source_t consistently" 2012-01-27 09:06:00 -08:00
Glenn Kasten
e0ec95efb6 Merge "AudioStreamIn and AudioStreamOut" 2012-01-27 07:22:30 -08:00
Glenn Kasten
faa921735e Merge "Declare methods in binder opcode order" 2012-01-27 07:19:53 -08:00
Glenn Kasten
84a68b7bad Merge "Use enum effect_state consistently" 2012-01-27 07:19:10 -08:00
Glenn Kasten
e59167a25e Merge "Use enum track_state consistently" 2012-01-27 07:18:23 -08:00
Glenn Kasten
3596794e2f Merge "Use enum mixer_state consistently" 2012-01-27 07:16:46 -08:00
The Android Automerger
e093eabe76 merge in ics-mr1-release history after reset to ics-mr1 2012-01-26 18:32:07 -08:00
Alon Albert
751ecf24fd Merge "Throw NPE if s is null" 2012-01-26 17:05:58 -08:00
Roman Nurik
94a7d3f291 am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
  docs: add NOTICE to action bar icon pack and sprinkle download links
2012-01-26 16:35:06 -08:00
Roman Nurik
716fa3cdcd Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 2012-01-26 16:32:56 -08:00
Andreas Huber
e3e675fea2 Merge "The software AAC encoder is now an OMX component." 2012-01-26 16:00:38 -08:00
Chet Haase
bfe3b45d0e Merge "Fix old issue with compatibility-scaled apps and Animations" 2012-01-26 15:53:03 -08:00
Daniel Sandler
3cef740514 am 70828a1d: am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '70828a1d40c9bf0e5066166216013093298de034':
  Suppress mobile-out-of-service label if wifi connected.
2012-01-26 15:47:06 -08:00
Roman Nurik
953dce0764 am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
  docs: Update designing-navigation training class to link to Android Design
2012-01-26 15:35:46 -08:00
Roman Nurik
4f237b4ce6 Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 2012-01-26 15:33:57 -08:00
Geremy Condra
7ac703fedf Merge "Removed intent logging from SearchDialog.java" 2012-01-26 15:06:18 -08:00
Jim Miller
345d9dd3f0 Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled." 2012-01-26 14:30:49 -08:00
Eric Fischer
200e2c8024 Merge "Import translations. DO NOT MERGE" 2012-01-26 14:26:10 -08:00
Gilles Debunne
16b060f555 Merge "Modified algorithm to remove duplicated suggestions" 2012-01-26 14:09:20 -08:00
Gilles Debunne
9c10a1d2ac Merge "Remove @deprecate in View's fadingEdge" 2012-01-26 14:09:00 -08:00
Stephen Hines
789e6fc09b Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 2012-01-26 13:55:57 -08:00
Daniel Sandler
9604fdcf94 am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.
2012-01-26 13:04:17 -08:00
Daniel Sandler
e84ea3722f Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Scott Main
ed46932b49 am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP
* commit '2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
  docs: add action bar icons ZIP
2012-01-26 11:47:35 -08:00
Scott Main
9912602489 am 6c055bbd: docs: add action bar icons ZIP
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP
2012-01-26 11:44:58 -08:00