ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
45,876 Commits 2 Branches 0 Tags 54 MiB
ed61a47c5b
Commit Graph

45876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
a3f66272e3 am cb20fab2: am aac21480: Reconcile with ics-mr1-release 
* commit 'cb20fab2ee39cfcb43400b88098b75a8aab4b0e0':
 2012-02-24 14:04:16 -08:00
Andreas Huber
f194523529 Merge "Make sure we return input/output buffers to the codec not just while" 2012-02-24 14:03:27 -08:00
Andreas Huber
aaa2843c03 Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm" 2012-02-24 14:02:52 -08:00
The Android Open Source Project
c7b46b6260 am aac21480: Reconcile with ics-mr1-release 
* commit 'aac214800b518259306960ff9cc90de65d095398':
 2012-02-24 14:01:27 -08:00
The Android Open Source Project
bb4bcfc028 Reconcile with ics-mr1-release 
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
 2012-02-24 13:57:46 -08:00
Glenn Kasten
29348a8925 Merge "Remove TrackBase::mFlags" 2012-02-24 13:17:36 -08:00
Svetoslav Ganov
88ecefa475 Merge "Regression: Cannot query the content of certain windows." 2012-02-24 11:33:46 -08:00
Siva Velusamy
9291da97cb gltrace: attach buffer data sent with glBufferData 
Attach the buffer that is passed with glBufferData
and glBufferSubData to the proto buf.

Change-Id: I1b4c1172d405736b06cb0a356a6e241e1d60c4d5
 2012-02-24 11:32:00 -08:00
Jean-Baptiste Queru
d8a1448ff5 am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit 'ed7e1e830165678421ee7d1b3dac044214a6e635':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:11:10 -08:00
Jean-Baptiste Queru
b3a5ddc098 am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit '470230275431c8ae85debc3c089b6942c55fef0f':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:07:45 -08:00
Jean-Baptiste Queru
f50a9dc7bb am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit '26d9944e3f75123708ef0cfb158f48709348a361':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:05:15 -08:00
Jean-Baptiste Queru
8ebb94eb7e am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:02:29 -08:00
Daniel Sandler
a7e4b1a23c Merge "New notification priority and related APIs." 2012-02-24 10:53:42 -08:00
Svetoslav Ganov
a7e2d3cfaf Merge "UiTestAutomationBridge does not terminate its HandlerThread." 2012-02-24 10:52:10 -08:00
Jean-Baptiste Queru
93bd8c1c7b am 70450553: am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit '70450553f8f1e6ec4967f86a4b811db2940e8772':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:35:47 -08:00
Jean-Baptiste Queru
e21887471d am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 
* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:33:05 -08:00
Jean-Baptiste Queru
5a5fafcc79 am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit '14c6e2728c2ae39aab6fc9a9a77c402d7322afc0':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:32:34 -08:00
Jean-Baptiste Queru
57408cc033 am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 
* commit '428ece23f414d288981ea0ac8f326e9e71a57959':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:30:12 -08:00
Jean-Baptiste Queru
0827014e5a am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit '2accfc110a71add56f5e4c35228e88dfa3024676':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:29:45 -08:00
Jean-Baptiste Queru
9f32cdb3ae Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
332c28848f am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 
* commit 'c4aa19a578b8a11bea225994c58116b407e63a69':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:27:06 -08:00
Jean-Baptiste Queru
c89356e2f2 am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:26:53 -08:00
Jean-Baptiste Queru
a7ea406dc9 am ea227787: Merge changes I903353c5,I822dcc74 
* commit 'ea227787253e29da2d688399b097e05708d3bf73':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:24:34 -08:00
Svetoslav Ganov
f41564ab04 Merge "AccessibilityNodeInfos node properly cached." 2012-02-24 10:23:06 -08:00
John Reck
a7a6190be9 Merge "Fix HitTest type detection" 2012-02-24 10:22:56 -08:00
Jean-Baptiste Queru
3815cf38ad Merge "stagefright aacenc: Fix an inline asm constraint" 2012-02-24 10:22:34 -08:00
Andreas Huber
37f1a39f3b Merge "Small fix to MediaCodec" 2012-02-24 10:16:28 -08:00
Jean-Baptiste Queru
3f10c2513e Merge changes I903353c5,I822dcc74 
* changes:
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:07:49 -08:00
Jean-Baptiste Queru
4cb6eca476 am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" 
* commit '1527811984557ee0b5d6e476e84ed147e073cb45':
  stagefright aacenc: Zero-initialize a struct
 2012-02-24 10:03:47 -08:00
Jean-Baptiste Queru
754e9d92b7 am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" 
* commit '61022b06a352e5a6da382a09f51ea624581ada7f':
  stagefright aacenc: Zero-initialize a struct
 2012-02-24 10:00:56 -08:00
Jean-Baptiste Queru
f5442ba965 am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" 
* commit '5f83b95705fa84b87b498d67f3b1b8dc34038474':
  stagefright aacenc: Zero-initialize a struct
 2012-02-24 09:57:51 -08:00
Jean-Baptiste Queru
107e2c7b64 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" 
* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
  stagefright aacenc: Zero-initialize a struct
 2012-02-24 09:54:58 -08:00
Jean-Baptiste Queru
64c6b9d421 am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 
* commit '4de803c76d4afd0f542c086b555b71729b3c5796':
  stagefright aacenc: Avoid warnings about incompatible pointer types
 2012-02-24 09:52:54 -08:00
Jean-Baptiste Queru
afe1786ba1 am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 
* commit '459df4ef8368ea84ce7d07981c6867a7b7fef14e':
  stagefright aacenc: Avoid warnings about incompatible pointer types
 2012-02-24 09:50:27 -08:00
Jean-Baptiste Queru
3b76648057 am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 
* commit 'e7650c327980f15c6cd53ad0081a54d78c3248f0':
  stagefright aacenc: Avoid warnings about incompatible pointer types
 2012-02-24 09:48:14 -08:00
Jean-Baptiste Queru
b36440d1d5 Merge "stagefright aacenc: Zero-initialize a struct" 2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
b445a23c74 am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 
* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
  stagefright aacenc: Avoid warnings about incompatible pointer types
 2012-02-24 09:45:40 -08:00
Jean-Baptiste Queru
999a700730 am 307f47aa: am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 
* commit '307f47aa5def85d0c0bb4af725ff557707c5be86':
  stagefright aacenc: Add const declarations to some pointers
 2012-02-24 09:28:09 -08:00
Jean-Baptiste Queru
ea00944a4f am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 
* commit '7e8b65dfbaaf1e5901e49e048f92b19c184eabe4':
  stagefright aacenc: Add const declarations to some pointers
 2012-02-24 09:25:34 -08:00
Jean-Baptiste Queru
8d9d3f917e am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 
* commit '7ffa4546de0b9e22b4896731cdfd1655f61a0b6c':
  stagefright aacenc: Add const declarations to some pointers
 2012-02-24 09:23:23 -08:00
Jean-Baptiste Queru
be444488fc am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" 
* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
  stagefright aacenc: Add const declarations to some pointers
 2012-02-24 09:20:44 -08:00
Jean-Baptiste Queru
69ce038818 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
b76e45bd85 am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" 
* commit '5c2f1220f90ae68a064195ba3c94f1319813f32c':
  stagefright aacenc: Fix inline asm
 2012-02-24 09:12:17 -08:00
Jean-Baptiste Queru
aad718b998 am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" 
* commit '901b8bb09ffdb0c64c0a8522016ffc1da6358a92':
  stagefright aacenc: Fix inline asm
 2012-02-24 08:57:40 -08:00
Jean-Baptiste Queru
39ad1a1f6f am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm" 
* commit 'aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
  stagefright aacenc: Fix inline asm
 2012-02-24 08:53:30 -08:00
Jean-Baptiste Queru
adae87846c Merge "stagefright aacenc: Add const declarations to some pointers" 2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
e5cd6d2404 am 1b704610: Merge "stagefright aacenc: Fix inline asm" 
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
  stagefright aacenc: Fix inline asm
 2012-02-24 08:50:32 -08:00
Jean-Baptiste Queru
026b1b26e5 Merge "stagefright aacenc: Fix inline asm" 2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
d48dfdaaed am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" 
* commit '0c96e8690408e3cfc12eee521a442c52f1c10b27':
  stagefright aacenc: Fix inline asm constraints
 2012-02-24 08:01:10 -08:00
Jean-Baptiste Queru
a29ae9e97f am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" 
* commit '41087f7920196f81a50f320c9d538b36534f178d':
  stagefright aacenc: Fix inline asm constraints
 2012-02-24 07:59:05 -08:00