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

18174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
e9f1a6478f am 3e5e21d4: am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 
Merge commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d'

* commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d':
  StrictMode: gather and return violating stacks in Binder replies
 2010-07-15 23:05:39 -07:00
Brad Fitzpatrick
721c4162c3 am cc52121c: am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread 
Merge commit 'cc52121c4f88e9feb8404937bcbfff6e73084666'

* commit 'cc52121c4f88e9feb8404937bcbfff6e73084666':
  More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
 2010-07-15 23:05:35 -07:00
Christopher Tate
ba57d1b9a5 am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread 
Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
  Add native C APIs for working with the Asset Manager
 2010-07-15 23:05:27 -07:00
James Dong
e52c769000 am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoder 
Merge commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd'

* commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd':
  Initial check-in for software m4v_h263 encoder
 2010-07-15 23:04:48 -07:00
Shih-wei Liao
1bb3fead84 Merge "Preparing for build system change. Fix the build error in http://b/issue?id=2781522." 2010-07-15 22:35:31 -07:00
Dmitri Plotnikov
faf28bd572 Merge "Fixing NPE in CursorLoader" 2010-07-15 18:56:11 -07:00
Jason Sams
99e468a5c9 Merge "1st cut of ForEach and test." 2010-07-15 17:12:10 -07:00
Fred Quintana
55b1e0b5ff Merge "fix a bug where some accounts changed listeners don't see the new version of the accounts because the accounts changed broadcast is sent from within the transaction try block, thus before db.endTransaction() is called." 2010-07-15 16:35:03 -07:00
Robert Greenwalt
733a2f8ab4 Merge "Fix Emulator boot." 2010-07-15 16:01:25 -07:00
Jaikumar Ganesh
7ff0daafbe Merge "Handle Input and network signal changes for HID and tethering." 2010-07-15 16:00:02 -07:00
Brad Fitzpatrick
64bdb3c980 am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 
Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp

* commit '1772c34e5331a6456c8a93051192d19ff873c062':
  StrictMode: gather and return violating stacks in Binder replies
 2010-07-15 15:44:46 -07:00
Brad Fitzpatrick
7f7fa79c4e am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread 
Merge commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp

* commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122':
  More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
 2010-07-15 15:44:41 -07:00
Brad Fitzpatrick
48d2d65320 Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 2010-07-15 15:42:41 -07:00
Brad Fitzpatrick
be581cfa17 Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread 2010-07-15 15:42:12 -07:00
Alex Sakhartchouk
d72ad79168 Merge "Populate java objects with native data from a3d file. Remove legacy constructor from programraster Make a3d object creation synchronous" 2010-07-15 15:19:07 -07:00
Christopher Tate
083b89a41c am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread 
Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp

* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
  Add native C APIs for working with the Asset Manager
 2010-07-15 15:03:32 -07:00
Christopher Tate
005c212acd Merge "Add native C APIs for working with the Asset Manager" into gingerbread 2010-07-15 15:00:14 -07:00
Romain Guy
90cafaef56 Merge "Add support for BitmapShader." 2010-07-15 14:45:37 -07:00
James Dong
0d049910d8 am 42ef0c71: Initial check-in for software m4v_h263 encoder 
Merge commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp

* commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
  Initial check-in for software m4v_h263 encoder
 2010-07-15 14:37:33 -07:00
Christopher Tate
9373680116 Add native C APIs for working with the Asset Manager 
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
 2010-07-15 14:28:21 -07:00
Jim Shuma
0b70a47248 Merge "Making Program*.Builder classes' setters return 'this'" 2010-07-15 13:43:52 -07:00
Robert Greenwalt
3a27f0912b Merge "Don't cast CONNECTING msgs to CONNECTED." 2010-07-15 13:35:14 -07:00
Brad Fitzpatrick
d36f4a5f13 StrictMode: gather and return violating stacks in Binder replies 
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.

Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
 2010-07-15 13:18:05 -07:00
Brad Fitzpatrick
a877cd85b5 More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync. 
Change-Id: Ia67cabcc17a73a0f15907ffea683d06bc41b90e5
 2010-07-15 13:18:05 -07:00
Dave Sparks
b8b253799a Merge "Add some javadoc to AudioRecord, plus updates based on code review comments." 2010-07-15 12:35:52 -07:00
Steve Howard
27c85e04ea am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'

* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
  Interface support for custom HTTP headers in DL manager
 2010-07-15 12:31:29 -07:00
Mike Lockwood
9ea8b8ea6d Merge changes I93364c74,I5ca831b8 
* changes:
  Exclude MTP implementation from simulator build
  Fixes for simulator build on lucid
 2010-07-15 12:31:08 -07:00
Steve Howard
fd5a8250e9 am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp

* commit 'd6343c26b8580f61a257a3045bfa124049201116':
  Interface support for custom HTTP headers in DL manager
 2010-07-15 12:28:39 -07:00
Steve Howard
f568a7480d Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 2010-07-15 12:24:14 -07:00
Scott Main
164fa377d1 am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs
 2010-07-15 11:54:15 -07:00
James Dong
015fdae70f am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'

* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
  Support user-supplied timescales for authoring
 2010-07-15 11:54:10 -07:00
Joe Onorato
815fe39328 am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07'

* commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07':
  Clean up some style in the makefiles.
 2010-07-15 11:54:00 -07:00
Joe Onorato
4894277c72 am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'

* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:53:51 -07:00
Scott Main
69c3a5cddf am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp

* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
  docs: lots of additions to the resources docs
 2010-07-15 11:23:08 -07:00
Scott Main
5e22cd7219 am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs
 2010-07-15 11:20:32 -07:00
James Dong
f0ff0aa6b7 am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
  Support user-supplied timescales for authoring
 2010-07-15 11:18:53 -07:00
Scott Main
a4e25ab1f3 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
James Dong
13bea64393 Merge "Support user-supplied timescales for authoring" into gingerbread 2010-07-15 11:16:08 -07:00
Joe Onorato
87d49d86d8 am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp

* commit '562124e84d8ae63b614b14ba257680571091ef1f':
  Clean up some style in the makefiles.
 2010-07-15 11:12:57 -07:00
Joe Onorato
3efa627241 am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp

* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:12:53 -07:00
Joe Onorato
3736a71e56 Merge "checkpoint tablet status bar" 2010-07-15 11:09:04 -07:00
Joe Onorato
51b23cda38 Merge "Clean up some style in the makefiles." into gingerbread 2010-07-15 11:08:39 -07:00
Joe Onorato
72f26b73d2 Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 2010-07-15 11:08:34 -07:00
Mike Lockwood
bec2b8a48b Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic." 2010-07-15 10:41:17 -07:00
Jeff Brown
a903001e3c am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target. 
Merge commit 'd1313da5999e06be16e52527cfba443f66b333a1'

* commit 'd1313da5999e06be16e52527cfba443f66b333a1':
  Don't build framework tests for simulator target.
 2010-07-15 10:24:10 -07:00
Fabrice Di Meglio
b916f6f17f Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)" 2010-07-15 10:23:31 -07:00
Jeff Brown
015b8a66db am eb6e0df1: Don\'t build framework tests for simulator target. 
Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp

* commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3':
  Don't build framework tests for simulator target.
 2010-07-15 10:21:18 -07:00
Mike Lockwood
98c133922f Merge "SQLiteDatabase: Add mechanism for registering custom sqlite3 functions" 2010-07-15 08:38:18 -07:00
Andrew Stadler
15b7c6ec30 am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo 
Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114'

* commit '521e9aa7523220c3dc48f6abd32fad6b76eea114':
  Skip hostname verification when using insecure factory
 2010-07-14 23:16:25 -07:00
Jeff Brown
a50ee3ecb3 Don't build framework tests for simulator target. 
Change-Id: I70f29c7eb307e4f3ec5702f4eb9d97b4342e2f36
 2010-07-14 22:55:02 -07:00