drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,386 Commits 1 Branch 0 Tags
Commit Graph

68386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
930b3c0b22 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
e3463238ed 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
b8a098b287 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
64d2ca5e21 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
0b8525c9a1 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
2ba0804164 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
cfef1d0ac0 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
8eb14828f1 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
19bb62613f 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
360db46e78 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
5ba910d867 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
b205a5d861 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
18a64b74aa 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
6b4d7bada0 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
2bf76b983d 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
484fc74beb 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
Jean-Baptiste Queru
eb483de58e am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit 'bf5c5e5b03fda1b6397e95fa621ed9b0649a5360':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:12:21 -08:00
Jean-Baptiste Queru
5b299d2f90 am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" 
* commit '18643e705a50f6c1c865e56e75d8403422a76d65':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
 2012-02-27 13:12:19 -08:00
Jean-Baptiste Queru
bf8269238b am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 
* commit 'faf38b24c0255ea7492277b0aa03a401dbdbb2b8':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
 2012-02-27 13:10:10 -08:00
Jean-Baptiste Queru
b7913f709b am 163777b8: am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit '163777b8be102a10f6e4a4a6c5be90eed2a479d2':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:10:07 -08:00
Jean-Baptiste Queru
040c5b2ca7 am ded8e681: am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 
* commit 'ded8e6818dbec3f1a6589345f0d8d6b189e1ea2b':
  stagefright amrwb: Change a C++ style cast into a C style cast
 2012-02-27 13:10:04 -08:00
Jean-Baptiste Queru
50ee92e972 am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* commit 'd91b744dedaa19a42ea9d878cfa5925cb15b2698':
  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:10:00 -08:00
Jean-Baptiste Queru
a887ff9ae6 am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:09:57 -08:00
Jean-Baptiste Queru
f7210cf55c am 7346d73c: am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '7346d73cac355f2b05051450eb1059d5e11e4ffb':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:09:53 -08:00
Jean-Baptiste Queru
3e61e41343 am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit '32901b397b590cc9133d21caab20b5ef01f0dd04':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:09:50 -08:00
Jean-Baptiste Queru
4bcdeb8696 am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" 
* commit '716a051719993cae576590f6a43620697e50b3b5':
  stagefright amrwb: Make a global const array static
 2012-02-27 13:09:46 -08:00
Jean-Baptiste Queru
bf5c5e5b03 am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit 'c1da1e1b2f18896c65df85de93a07680175c5277':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:09:43 -08:00
Jean-Baptiste Queru
18643e705a am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" 
* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
 2012-02-27 13:09:40 -08:00
Jean-Baptiste Queru
faf38b24c0 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 
* commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
 2012-02-27 13:07:43 -08:00
Jean-Baptiste Queru
163777b8be am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 
* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
  stagefright amrwb: Make local const arrays static
 2012-02-27 13:07:40 -08:00
Jean-Baptiste Queru
ded8e6818d am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 
* commit '695cfe1e1e189f176fdf994f72d05a0129a66394':
  stagefright amrwb: Change a C++ style cast into a C style cast
 2012-02-27 13:07:36 -08:00
Jean-Baptiste Queru
d91b744ded am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 
* commit 'f7f1280e0c71d64098efb42b58a922d056164b5e':
  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:07:33 -08:00
Jean-Baptiste Queru
4f74be57e7 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" 
* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
  stagefright aacenc: Simplify the definition of __inline
 2012-02-27 13:07:30 -08:00
Jean-Baptiste Queru
7346d73cac am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" 
* commit '77576ff487e227092cdaf09db163e21f1e07604a':
  stagefright amrwbenc: Remove a useless check
 2012-02-27 13:07:26 -08:00
Jean-Baptiste Queru
32901b397b am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" 
* commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7':
  stagefright aacenc: Remove a stray semicolon
 2012-02-27 13:07:23 -08:00
Jean-Baptiste Queru
716a051719 am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" 
* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
  stagefright amrwb: Make a global const array static
 2012-02-27 13:07:20 -08:00
Jean-Baptiste Queru
c1da1e1b2f am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" 
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
  stagefright amrwbenc: Change keyword ordering
 2012-02-27 13:07:16 -08:00
Jean-Baptiste Queru
6bc542e0f3 am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" 
* commit '5aff259c61e54e441ed04bf77e3cc69a0374432d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
 2012-02-27 13:07:12 -08:00
Mathias Agopian
8335f1cccc fix libgui header location 
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
 2012-02-27 13:03:08 -08:00
Mathias Agopian
57235fc65b split utils/threads.h into multiple headers 
AndroidDefs.h - C/C++ enums and types
Mutex.h - Mutex class declaration
Condition.h - Condition class declaration
RWLock.h - RWLock class declaration
Thread.h - Thread class declaration
AndroidThreads.h - low-level thread creation functions
threads.h - includes all the above for backward source compatibility

Change-Id: Ia2f80c175333b59a41d1720985810bb2346e94cb
Note: implementations are still in Threads.cpp
 2012-02-27 13:03:04 -08:00
Mathias Agopian
7d3916ff9c libagl shouldn't export anything 
Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
 2012-02-27 13:03:04 -08:00
Mathias Agopian
12aba767c7 remove dummy libsurfaceflinger_client 
Change-Id: Idd67a3f936deae7ba5d1cd5000d191fad271381e
 2012-02-27 13:03:03 -08:00
Vikram Aggarwal
4a88964d65 Merge "affect -> effect and incorrect possessive" 2012-02-27 12:36:53 -08:00
Siva Velusamy
89dd68f8d2 Merge "gltrace: Make code 64-bit safe." 2012-02-27 12:31:01 -08:00
Jean-Baptiste Queru
9e3d957599 Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
354ac772ec Merge "stagefright amrwb: Make local const arrays static" 2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
695cfe1e1e Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 2012-02-27 12:13:27 -08:00
felipeal
1b4e4b657c Fixed minor typo on Javadoc 
Change-Id: I2040520030319c0330d659dfa06716be0bd41b7b
 2012-02-27 12:09:13 -08:00
Siva Velusamy
d4edba0fe9 gltrace: Make code 64-bit safe. 
Currently, the trace API passes the pointers that need to be
patched up via 32 bit integers. Such code will not be 64 bit safe.
This patch sends all pointers in a separate array of pointers
for the fixup calls to read from.

Change-Id: If975333f11a6f6f9a74fba57de328affaed452a5
 2012-02-27 12:08:47 -08:00
Daniel Lam
05221052c5 Revert "Removed dependecies between BufferQueue and SurfaceTexture" 
This reverts commit a631399f71dbc7659d2f241968f85d337726ae61
 2012-02-27 11:32:06 -08:00