Glenn Kasten
9f22baff2b
Merge "AudioFlinger const methods and parameters"
2012-02-28 07:21:09 -08:00
Jean-Baptiste Queru
81ecdad03e
am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
...
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-28 07:19:40 -08:00
Jean-Baptiste Queru
6054e3e186
am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility"
...
* commit 'd107453ddf3af507e015ac641d5fb67ed513cd4b':
Add stubs for better compatibility
2012-02-28 07:19:36 -08:00
Glenn Kasten
aea503952a
Merge "Fix theoretical race condition in addOutputTrack"
2012-02-28 07:18:27 -08:00
Glenn Kasten
2f0b8f08ed
Merge "AudioBufferProvider comments and cleanup"
2012-02-28 07:17:47 -08:00
Mathias Agopian
7a7524810a
get rid of MemoryHeapPmem
...
MemoryHeapPmem is not used any longer. PMEM is not a supported
type of memory by the system anymore. a particular device might
use PMEM and need something like MemoryHeapPmem, in this case this
should be implemented in device specific code (HAL).
This will most likely break older no longer supported targets.
Change-Id: I434e4291219950018de8b793b0403bb2d92dd5cc
2012-02-27 19:58:57 -08:00
Mathias Agopian
ed61a47c5b
Merge "a window could get stuck to gpu composition"
2012-02-27 19:48:36 -08:00
Mathias Agopian
e0dec77b25
Merge "move CursorWindow from libbinder to libandroidfw"
2012-02-27 19:48:21 -08:00
Andrew Hsieh
0ae8c14b4b
Fixed several 64-bit porting issues
...
1. Use "%zu" instead of "%d" for size_t in printf
2. Variable precision specifier (eg. "%.*s") in printf should be of type int.
(iov_len is size_t which is 64-bit when compiled with -m64)
3. Use PRId64 instead of "%lld" to print variables of type int64_t
Change-Id: I2be40a6514b5dffa0038d62b9bccc3401b8756e6
2012-02-27 18:50:55 -08:00
Mathias Agopian
89d353a4c5
move CursorWindow from libbinder to libandroidfw
...
Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
2012-02-27 18:11:20 -08:00
Jeff Sharkey
679154b333
Merge "Move NetworkStatsFactory to faster ProcFileReader."
2012-02-27 18:09:29 -08:00
Jamie Gennis
910b2b2ff5
Merge "Add tracing to various graphics components."
2012-02-27 18:06:39 -08:00
Jamie Gennis
1c8e95cf86
Add tracing to various graphics components.
...
This change adds ATRACE call tracing to BufferQueue,
SurfaceTextureClient, SurfaceTexture, SurfaceFlinger, Layer, and EGL.
Change-Id: I9d75ed26f5a3f0d1af635da38289520134cfbbb7
2012-02-27 17:50:35 -08:00
Jeff Sharkey
c13af3c0f9
Merge "Suppress StrictMode when reading /proc/ files."
2012-02-27 17:44:09 -08:00
Adam Powell
793be05776
Merge "View pressed state dispatching tweaks"
2012-02-27 17:38:51 -08:00
Mathias Agopian
fa8009d6ac
Merge "remove dependency on unneeded headers"
2012-02-27 17:38:27 -08:00
Chia-chi Yeh
694602715e
Merge "VpnDialogs: hide the fields when the statistic numbers are unavailable."
2012-02-27 17:35:06 -08:00
Michael Jurka
7244f940d7
Merge "Remove unnecessary code"
2012-02-27 17:15:41 -08:00
Jamie Gennis
8b82aff67c
Merge "Removed dependecies between BufferQueue and SurfaceTexture"
2012-02-27 17:06:53 -08:00
JP Abgrall
fd970dd81d
Merge "dumpstate: use /system/xbin/su directly"
2012-02-27 17:05:55 -08:00
Jean-Baptiste Queru
962ccb6d93
am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
...
* commit '7b6b81f89538d34415869710cbf464ba7c28bf9b':
stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-27 17:02:15 -08:00
Dave Burke
f4a475427f
Merge "Increase max size of log size by 50% on userdebug builds."
2012-02-27 17:01:38 -08:00
Jean-Baptiste Queru
476df7e91b
am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
...
* commit 'f016dc1bd7f9a67adac13b0b564692dab8723392':
stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-27 16:59:59 -08:00
Mathias Agopian
ec923ee0d0
a window could get stuck to gpu composition
...
this could happen after an orientation change. basically
we need to triger a geometry-changed when the very first buffer
is received
Change-Id: I097e411fd6612c18725737cffccdbf6b2af3511c
2012-02-27 16:58:04 -08:00
Jean-Baptiste Queru
5316ab3c34
am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
...
* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-27 16:57:06 -08:00
Daniel Lam
eae59d2ea7
Removed dependecies between BufferQueue and SurfaceTexture
...
Refactored SurfaceTexture and BufferQueue such that share
no protected members. Created an consumer facing interface
for BufferQueue in preparation of connecting SurfaceTexture
and BufferQueue through a binder.
Change-Id: I938e63e085128148c58d0e26c7213b30145c109f
2012-02-27 16:40:48 -08:00
felipeal
01d80eebfb
Merge "Fixed minor typo on Javadoc"
2012-02-27 16:39:50 -08:00
Eric Laurent
c060dde299
Merge "audio preprocessing: fix multiple enable problem"
2012-02-27 16:35:30 -08:00
Alon Albert
5e783b363e
Merge "Add new Reminder Method: Alarm"
2012-02-27 16:29:55 -08:00
Craig Mautner
275a6ebb64
Merge "Fix bug introduced when moving animation step out from between assignments to wasAnimating and nowAnimating. Now wasAnimating once again contains the animation state prior to the animation step."
2012-02-27 16:28:15 -08:00
Jean-Baptiste Queru
5d46260664
Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
2012-02-27 16:23:19 -08:00
The Android Automerger
2b37af478f
merge in ics-mr1-release history after reset to ics-mr1
2012-02-27 16:10:06 -08:00
Jean-Baptiste Queru
da12204605
am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility"
...
* commit '84dd87d992d88d1f407796a41bc8baa27dc97a81':
Add stubs for better compatibility
2012-02-27 16:03:41 -08:00
Jean-Baptiste Queru
2d0b5dad97
am 015a248e: am 93df415c: Merge "Add stubs for better compatibility"
...
* commit '015a248e631dc10fd6b52ae8773c0a3e0cf752af':
Add stubs for better compatibility
2012-02-27 16:01:31 -08:00
Jean-Baptiste Queru
6a22ed0a4b
am 93df415c: Merge "Add stubs for better compatibility"
...
* commit '93df415c1e0b4c99f274adb3629ce19abf1d0f53':
Add stubs for better compatibility
2012-02-27 15:58:50 -08:00
Eric Fischer
02a8087414
Merge "Import translations. DO NOT MERGE"
2012-02-27 15:41:31 -08:00
Jean-Baptiste Queru
47e81bd44d
Merge "Add stubs for better compatibility"
2012-02-27 15:36:22 -08:00
Gilles Debunne
b423565a1a
Merge "Selection highlight made possible with no editor"
2012-02-27 15:30:57 -08:00
Gilles Debunne
e0b94933aa
Merge "Fix for NPE on long press to start a selection on text."
2012-02-27 15:30:37 -08:00
Gilles Debunne
c4dba0be3c
Merge "Fix for NPE when dragging on TextView"
2012-02-27 15:28:49 -08:00
Alex Sakhartchouk
ccfce6183c
Merge "Removing GL calls from librs"
2012-02-27 15:08:07 -08:00
George Mount
2b9a660e92
Merge "Perform action when action button pressed during text input."
2012-02-27 15:06:29 -08:00
The Android Automerger
6399e0a1e8
merge in ics-mr1-release history after reset to ics-mr1
2012-02-27 14:42:58 -08:00
George Mount
e9c382839f
Merge "Paste window instead of action bar when cursor shown."
2012-02-27 14:21:03 -08:00
John Huang
dd2fc442db
Merge "Prevent dial() return null in a racing condition."
2012-02-27 13:47:13 -08:00
Romain Guy
4b5af44db1
Merge "Small optimization for the battery status screen"
2012-02-27 13:35:37 -08:00
Jamie Gennis
015b842041
Merge "libutils: add a system-wide tracing utility"
2012-02-27 13:35:30 -08:00
Glenn Kasten
9489e82e8e
Merge "Fix tracking of hardware state for dump"
2012-02-27 13:23:51 -08:00
Jamie Gennis
fbb1655916
Merge "Revert "Removed dependecies between BufferQueue and SurfaceTexture""
2012-02-27 13:23:51 -08:00
Jean-Baptiste Queru
2cf1bc18b2
am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
...
* commit '19bb62613f512b62d492fb4caf36de88fd1914dd':
stagefright aacenc: Add prototypes for arm specific implementations of functions
2012-02-27 13:15:15 -08:00