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

63250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Baptiste Queru
5aff259c61 Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" 2012-02-27 10:58:51 -08:00
The Android Open Source Project
aac214800b Reconcile with ics-mr1-release 
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
 2012-02-24 13:57:46 -08:00
Jean-Baptiste Queru
4702302754 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
26d9944e3f 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
Jean-Baptiste Queru
14c6e2728c 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
6a300a5413 Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
428ece23f4 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
2accfc110a 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
c4aa19a578 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
Jean-Baptiste Queru
d6a25154d9 Merge "stagefright aacenc: Fix an inline asm constraint" 2012-02-24 10:22:34 -08:00
Jean-Baptiste Queru
ea22778725 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
61022b06a3 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
5f83b95705 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
459df4ef83 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
bf45bbf3b4 Merge "stagefright aacenc: Zero-initialize a struct" 2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
e7650c3279 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
7e8b65dfba 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
7ffa4546de 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
e5bdd24b69 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
901b8bb09f 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
47b56c5a46 Merge "stagefright aacenc: Add const declarations to some pointers" 2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
aa86aa60dc 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
1b7046108c Merge "stagefright aacenc: Fix inline asm" 2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
41087f7920 am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" 
* commit 'd7ab4e0c42a34331620c63c8c58d0dabc658eb1a':
  stagefright aacenc: Fix inline asm constraints
 2012-02-24 07:55:59 -08:00
Jean-Baptiste Queru
d7ab4e0c42 am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" 
* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
  stagefright aacenc: Fix inline asm constraints
 2012-02-24 07:53:43 -08:00
Jean-Baptiste Queru
bf1e85bfc8 Merge "stagefright aacenc: Fix inline asm constraints" 2012-02-24 07:39:03 -08:00
Xavier Ducrohet
b3c780f16c am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. 
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.
 2012-02-23 18:42:01 -08:00
inazaruk
9694910e17 am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. 
* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
 2012-02-23 18:41:54 -08:00
Xavier Ducrohet
816b873df1 Move the automatic namespace outside of the res namespace. do not merge. 
(cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225)

Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
 2012-02-23 18:10:20 -08:00
inazaruk
eed8d0b3af Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. 
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.

Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>

(cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18)

Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
 2012-02-23 18:09:31 -08:00
Joe Fernandez
53c0d46d85 am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
 2012-02-23 14:25:01 -08:00
Joe Fernandez
566328a2a5 Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 2012-02-23 14:22:41 -08:00
Jean-Baptiste Queru
fe99051c78 am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 12:59:22 -08:00
Jean-Baptiste Queru
0e25e4cd29 am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries
 2012-02-23 12:57:03 -08:00
Jean-Baptiste Queru
63e43ba56a Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 2012-02-23 12:38:14 -08:00
The Android Automerger
b585b9f400 merge in ics-mr1-release history after reset to ics-mr1 2012-02-23 10:45:15 -08:00
Michael Jurka
0a23267337 am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen 
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
  Don't allow screen invalidations to go outside bounds of screen
 2012-02-23 08:07:22 -08:00
Michael Jurka
bf378fd7d7 Don't allow screen invalidations to go outside bounds of screen 
Fixes invalidation issue in Launcher

Change-Id: Iab32149489aed6884e917f0ac5a548d4ae26896e
 2012-02-23 00:19:58 -08:00
Scott Main
ce980d8ea0 am 68d97aa2: Merge "docs: fix broken link" into ics-mr1 
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
  docs: fix broken link
 2012-02-22 16:23:04 -08:00
Scott Main
68d97aa2c1 Merge "docs: fix broken link" into ics-mr1 2012-02-22 16:20:49 -08:00
Joe Fernandez
224741afda docs: NDK overview, remove x86 instruction set mention (b/6044027) 
Change-Id: I37ee68fb78f2ed5edc1c34ff7198340b1ab5c49b
 2012-02-22 15:52:53 -08:00
Jean-Baptiste Queru
1cd83102d4 am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility" 
* commit 'b92aee4e8c3d93235c9a57afa81711383538f54f':
  Add stubs for improved compatibility
 2012-02-22 12:36:35 -08:00
Jean-Baptiste Queru
b92aee4e8c am 69e9c30c: Merge "Add stubs for improved compatibility" 
* commit '69e9c30c2641add74c9a3b02d0959c0ded9e66f7':
  Add stubs for improved compatibility
 2012-02-22 12:34:06 -08:00
Jean-Baptiste Queru
69e9c30c26 Merge "Add stubs for improved compatibility" 2012-02-22 12:22:07 -08:00
Xavier Ducrohet
22701ec5b1 am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
  Make sure resource references are resolved.
 2012-02-22 10:49:15 -08:00
Xavier Ducrohet
503247f213 Merge "Make sure resource references are resolved." into ics-mr1 2012-02-22 10:47:32 -08:00
Jean-Baptiste Queru
fc4215eec9 am 2d03a93e: Merge "Xcode 4.3 compatibility checkin" 
* commit '2d03a93ecf00fb43272364293a21f88720884ce2':
  Xcode 4.3 compatibility checkin
 2012-02-22 10:17:24 -08:00
Jean-Baptiste Queru
aff90790df am 4280891d: Merge "The bigger touch slop still has a problem" 
* commit '4280891dbc2cf60bdf51726e0aa9265ccb64ec88':
  The bigger touch slop still has a problem
 2012-02-22 09:56:27 -08:00
Jean-Baptiste Queru
2d03a93ecf Merge "Xcode 4.3 compatibility checkin" 2012-02-22 09:54:40 -08:00