Glenn Kasten
17fbbc078b
Merge "Improve performance for sp<> on stack"
2012-02-08 07:45:15 -08:00
Glenn Kasten
06d19c5101
Merge "AudioTrack declare more methods const"
2012-02-08 07:42:40 -08:00
Glenn Kasten
c1ad05d503
Merge "Use 0 not NULL for sp<> and wp<>"
2012-02-08 07:41:44 -08:00
Glenn Kasten
a4aa13cd31
Merge "Use bool instead of int"
2012-02-08 07:40:23 -08:00
Glenn Kasten
74de0ea599
Merge "Declare more IAudioFlinger methods const"
2012-02-08 07:39:27 -08:00
Glenn Kasten
7194b4b62c
Merge "Remove dead code"
2012-02-08 07:38:42 -08:00
Scott Main
d564282c23
am cc9dd9a6: am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
...
* commit 'cc9dd9a6373fef19fbfb40f0e09ac8016bc74e38':
2012-02-07 21:52:27 -08:00
Scott Main
41730fabfe
am f8274e50: am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
...
* commit 'f8274e506c1e4ef798554244370daf57cc88ecdb':
docs: fix typo in menu TOC
2012-02-07 21:52:24 -08:00
Scott Main
abe3a692b0
am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
...
* commit '02beef8445fbf45b4dfc2472275dc5b49bb41a50':
2012-02-07 21:50:20 -08:00
Scott Main
8d2d215ec3
am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
...
* commit '8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
2012-02-07 21:49:37 -08:00
Scott Main
6301e33ebb
am 09ff04d7: docs: fix typo in menu TOC
...
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
2012-02-07 21:48:03 -08:00
Scott Main
aec806c78b
am 09ff04d7: docs: fix typo in menu TOC
...
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
2012-02-07 21:47:38 -08:00
Guang Zhu
809fda5d0a
Merge "Revert "Make NDC not block forever and handle restart.""
2012-02-07 19:42:07 -08:00
Jason Sams
bfcafeb2f3
Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
2012-02-07 18:56:39 -08:00
Romain Guy
d0e5466e26
Merge "Fix the system"
2012-02-07 18:22:43 -08:00
Fabrice Di Meglio
1824f6668e
Merge "Fix bug #5979311 Change TextView to not clip top/bottom text"
2012-02-07 17:49:47 -08:00
Romain Guy
626283434b
Merge "Preliminary support for clipRect(Rect, Op)"
2012-02-07 17:07:00 -08:00
Romain Guy
b8a2e98cd7
Preliminary support for clipRect(Rect, Op)
...
This adds basic support for clip regions. It is currently disabled at compile
time. Enabling clip regions will require setting up a stencil buffer.
Change-Id: I638616a972276e38737f8ac0633692c3845eaa74
2012-02-07 17:04:34 -08:00
Robert Greenwalt
e24caa4501
Merge "Make NDC not block forever and handle restart."
2012-02-07 16:19:56 -08:00
Wink Saville
d2f63bb6e2
Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
2012-02-07 15:56:23 -08:00
Jeff Sharkey
78e9ea6e6c
Merge "Send broadcast when changing restrict background."
2012-02-07 15:50:02 -08:00
Jason Sams
9e373e2870
Merge "Implement RS VSync on new vsync infrastructure."
2012-02-07 15:39:44 -08:00
Daniel Lam
6b091c5300
Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue.
...
Change-Id: I514f6b802f6b49c9ae27bed37bf0b9d23da03c9a
2012-02-07 13:57:01 -08:00
Dianne Hackborn
1676828d11
Merge "Return information about whether overlays are disabled."
2012-02-07 13:46:46 -08:00
Dianne Hackborn
0ccd856d36
Merge "Only generate private symbols that are needed."
2012-02-07 13:46:28 -08:00
Svetoslav Ganov
d39a0ad4f7
Merge "Adding a method for retching the root node in UiTestAutomationBridge"
2012-02-07 12:07:23 -08:00
Jeff Sharkey
01f0d836f3
Merge "List rotated netstats files during --checkin dump."
2012-02-07 10:45:41 -08:00
Andreas Huber
70c2111296
Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
2012-02-07 10:43:08 -08:00
The Android Open Source Project
4e9f50a71e
am 6668958c: am 1bd8111b: Reconcile with ics-mr1-release
...
* commit '6668958cbe9aca2c8930020e9acad9ef1bf045a8':
2012-02-07 10:23:12 -08:00
The Android Open Source Project
652e8ffe13
am 1bd8111b: Reconcile with ics-mr1-release
...
* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
2012-02-07 10:21:31 -08:00
The Android Open Source Project
9930f484d0
Reconcile with ics-mr1-release
...
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
2012-02-07 10:18:32 -08:00
The Android Open Source Project
b8bdfddb72
am 01383571: am 07bebe8b: Reconcile with ics-mr1-release
...
* commit '0138357198244b5bda242e248ed98040622ea5af':
Don't use SNR in the invalid check.
2012-02-07 10:12:59 -08:00
The Android Open Source Project
fe9a8650cc
am 07bebe8b: Reconcile with ics-mr1-release
...
* commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
Don't use SNR in the invalid check.
2012-02-07 10:11:11 -08:00
The Android Open Source Project
9fd89364ab
Reconcile with ics-mr1-release
...
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
2012-02-07 10:09:08 -08:00
Marco Nelissen
25f45572ab
Merge "Make media scanner use new delete-parameter"
2012-02-07 08:28:02 -08:00
Dianne Hackborn
12839bee29
Return information about whether overlays are disabled.
...
Change-Id: I85ae42e9f28461f5142cc6b3c8e25ff3f195805a
2012-02-06 21:21:05 -08:00
Mathias Agopian
619258483f
Merge "make sure to ignore SIGPIPE in the write side of BitTube"
2012-02-06 19:18:57 -08:00
Mathias Agopian
99fe3c6d3d
make sure to ignore SIGPIPE in the write side of BitTube
...
Change-Id: If4f037f4403d3ecbcd5f91248354765fc0fa13cb
2012-02-06 19:17:56 -08:00
Xavier Ducrohet
492b8611a4
Merge "Fix a setBackgroundDrawable in layoutlib."
2012-02-06 18:07:21 -08:00
Fabrice Di Meglio
bcc4af6355
Merge "Fix bug #5968466 system running out of memory during WebView performance test"
2012-02-06 17:22:06 -08:00
Fabrice Di Meglio
4abb156cb5
Merge "Update BiDiTest app for adding GridLayout unit tests"
2012-02-06 17:21:40 -08:00
John Wang
cbcd55411f
am a0da8adf: am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit 'a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':
2012-02-06 17:06:18 -08:00
John Wang
ba7dcb9047
am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '7e6295b32310afddccf5fb030d4c475ed3678e0f':
Don't use SNR in the invalid check.
2012-02-06 17:06:16 -08:00
John Wang
1dba562c36
am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':
2012-02-06 17:04:42 -08:00
Craig Mautner
e549025943
Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
2012-02-06 17:04:23 -08:00
John Wang
35455a1f35
am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
Don't use SNR in the invalid check.
2012-02-06 17:04:11 -08:00
Tom Taylor
518877ec0d
Merge "CrespoMMS appears after delay in the thread"
2012-02-06 17:03:34 -08:00
John Wang
b4305fb3b2
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
2012-02-06 17:03:15 -08:00
John Wang
5e7679927c
am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
...
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
2012-02-06 17:02:30 -08:00
John Wang
5245acf270
Merge "Don't use SNR in the invalid check." into ics-mr1
2012-02-06 17:00:49 -08:00