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
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
Dave Burke
f4a475427f
Merge "Increase max size of log size by 50% on userdebug builds."
2012-02-27 17:01:38 -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
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
Eric Fischer
02a8087414
Merge "Import translations. DO NOT MERGE"
2012-02-27 15:41:31 -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
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
Jean-Baptiste Queru
8d54cfdbfc
am 360db46e: am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static"
...
* commit '360db46e78a1492b695d5be6e779386dc66a502e':
stagefright amrwb: Make local const arrays static
2012-02-27 13:15:13 -08:00
Jean-Baptiste Queru
ea3db059b0
am 5ba910d8: am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
...
* commit '5ba910d867d029e69c4f52667c02a4c114f849df':
stagefright amrwb: Change a C++ style cast into a C style cast
2012-02-27 13:15:10 -08:00
Jean-Baptiste Queru
59caadae76
am b205a5d8: am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
...
* commit 'b205a5d861c5ba31599084a42c7d92549f464dac':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
2012-02-27 13:15:06 -08:00
Jean-Baptiste Queru
2da1ae856b
am 18a64b74: am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
...
* commit '18a64b74aa3cb0babb5f50e5f80660f601d80123':
stagefright aacenc: Simplify the definition of __inline
2012-02-27 13:15:03 -08:00
Jean-Baptiste Queru
5420ac1516
am 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
...
* commit '6b4d7bada0b1d34f93149211cb179b71c864d5d3':
stagefright amrwbenc: Remove a useless check
2012-02-27 13:14:59 -08:00
Jean-Baptiste Queru
3ac2be7d9a
am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
...
* commit '2bf76b983da1d1730d685f9907d5d4fa6ea46fcd':
stagefright aacenc: Remove a stray semicolon
2012-02-27 13:14:56 -08:00
Jean-Baptiste Queru
28ccf75a57
am 484fc74b: am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
...
* commit '484fc74beb79d0b8d49223cb3fce9e1ccbfd3501':
stagefright amrwb: Make a global const array static
2012-02-27 13:14:53 -08:00
Jean-Baptiste Queru
4c286a3b95
am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
...
* commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0':
stagefright amrwbenc: Change keyword ordering
2012-02-27 13:14:48 -08:00
Jean-Baptiste Queru
d3d77fa261
am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
...
* commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
2012-02-27 13:14:45 -08:00
Jean-Baptiste Queru
385062256f
am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
...
* commit 'bf8269238be1c5bde9f82a986fb128d9a80f250b':
stagefright aacenc: Add prototypes for arm specific implementations of functions
2012-02-27 13:12:42 -08:00
Jean-Baptiste Queru
669bca5e98
am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static"
...
* commit 'b7913f709b443df8d55ac2f6e080ab0ae38bcadf':
stagefright amrwb: Make local const arrays static
2012-02-27 13:12:39 -08:00
Jean-Baptiste Queru
13a48cd127
am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
...
* commit '040c5b2ca716bef082506065606cb9708d051625':
stagefright amrwb: Change a C++ style cast into a C style cast
2012-02-27 13:12:37 -08:00
Jean-Baptiste Queru
aa4d424a89
am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
...
* commit '50ee92e972cf8a4cc56e95f44625eed649cc8196':
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
2012-02-27 13:12:34 -08:00
Jean-Baptiste Queru
ec72265fdf
am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
...
* commit 'a887ff9ae61f6cb925feb6e08643716ac28e35db':
stagefright aacenc: Simplify the definition of __inline
2012-02-27 13:12:32 -08:00
Jean-Baptiste Queru
d2905f09e8
am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"
...
* commit 'f7210cf55cafef55cca8cca65e1749b1dd088e77':
stagefright amrwbenc: Remove a useless check
2012-02-27 13:12:29 -08:00
Jean-Baptiste Queru
237209c56d
am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
...
* commit '3e61e413435ed745336c44d63fb6ffa6378e393b':
stagefright aacenc: Remove a stray semicolon
2012-02-27 13:12:26 -08:00
Jean-Baptiste Queru
0385a49c50
am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
...
* commit '4bcdeb86965d25697e2439a53f791cd140c8fe6b':
stagefright amrwb: Make a global const array static
2012-02-27 13:12:24 -08:00