Eric Fischer
10f5e63282
Merge "Import translations. DO NOT MERGE"
2012-02-09 11:37:18 -08:00
Eric Fischer
d2fa6e6a70
Merge "Import translations. DO NOT MERGE"
2012-02-09 11:26:02 -08:00
Dianne Hackborn
2bf030602f
Merge "Add new feature for running services in "isolated" sandbox processes."
2012-02-09 11:20:07 -08:00
Jamie Gennis
d94bb5c883
Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
2012-02-09 11:08:02 -08:00
Steve Block
de1ee07cae
Merge "Clarify comments for WebSettings."
2012-02-09 03:04:49 -08:00
Justin Ho
36d1a54ad5
Merge "Tentative fix for mysteriously recycled bitmap"
2012-02-08 12:59:17 -08:00
Dianne Hackborn
7d3e2484dd
Merge "Don't wait for current activity to pause before resuming next."
2012-02-08 11:38:23 -08:00
James Dong
1fb64cf678
Merge "Enable B frame support in MPEG4Writer"
2012-02-08 10:42:35 -08:00
Glenn Kasten
928f0f72e7
Merge "Combine duplicate code & document wp<> in mClients"
2012-02-08 10:27:58 -08:00
Gilles Debunne
2d92b3b2d6
Merge "Invalidate text display list when text properties change."
2012-02-08 10:27:46 -08:00
Glenn Kasten
05f21b75c4
Merge "Use audio_io_handle_t consistently instead of int"
2012-02-08 10:22:11 -08:00
Marco Nelissen
2c5fd304d9
Merge "Delete entries in bulk"
2012-02-08 10:15:01 -08:00
Glenn Kasten
8263b8fb9b
Merge "Effect UUID inputs passed by pointer are const"
2012-02-08 09:37:26 -08:00
Wink Saville
5777f7b31d
Merge "Add ril.test.emergency system property."
2012-02-08 09:19:19 -08:00
Glenn Kasten
3c1a823336
Merge "Use pid_t not int"
2012-02-08 08:40:28 -08:00
Glenn Kasten
e3c5e08ee1
Merge "Don't double destruct audio_track_cblk_t"
2012-02-08 08:40:15 -08:00
Glenn Kasten
ab76e39914
Merge "AudioFlinger methods const and inline"
2012-02-08 08:39:39 -08:00
Glenn Kasten
36293efd39
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
2012-02-08 08:34:33 -08:00
Glenn Kasten
9edfab2c1d
Merge "Use virtual destructors"
2012-02-08 08:33:41 -08:00
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
