ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
16,797 Commits 2 Branches 0 Tags 54 MiB
61be2642e4
Commit Graph

16797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
659b0a97fb am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread 
Merge commit '9d8bea11892a43eeab2a1119d68740845a8894e5' into gingerbread-plus-aosp

* commit '9d8bea11892a43eeab2a1119d68740845a8894e5':
  Initial checkin for software AVC encoder
 2010-07-13 11:01:37 -07:00
James Dong
fe03065ace Merge "Initial checkin for software AVC encoder" into gingerbread 2010-07-13 10:59:34 -07:00
Joe Malin
1761c59a10 am d93f4e5b: Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread 
Merge commit 'd93f4e5b70f37feae0cbdf1f456c167a1ea37433' into gingerbread-plus-aosp

* commit 'd93f4e5b70f37feae0cbdf1f456c167a1ea37433':
  DO NOT MERGE Doc Change: Javadoc for test case classes
 2010-07-13 09:53:27 -07:00
Joe Malin
6d2a4c5c70 Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread 2010-07-13 09:46:38 -07:00
Dianne Hackborn
ea76c7d5d0 am e339464f: am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 
Merge commit 'e339464f1c8efe7e53b761cf44ff5be6e537ecad' into gingerbread-plus-aosp

* commit 'e339464f1c8efe7e53b761cf44ff5be6e537ecad':
  Fix issue #2834005: Android Settings.Secure bypass
 2010-07-12 19:08:47 -07:00
Dianne Hackborn
281d8f991e am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 
Merge commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552' into gingerbread

* commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552':
  Fix issue #2834005: Android Settings.Secure bypass
 2010-07-12 19:06:24 -07:00
Dianne Hackborn
85001bc578 Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 2010-07-12 19:03:26 -07:00
Dirk Dougherty
ec3f497038 am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Merge commit '5a93032dcbe54223e03102d497d7e04370491737' into gingerbread-plus-aosp

* commit '5a93032dcbe54223e03102d497d7e04370491737':
  Doc change: add notes for ndk r4b.
 2010-07-12 17:42:33 -07:00
Dirk Dougherty
8728c6a548 doc change: resolved conflicts for merge of 3c691a8d to gingerbread 
Conflicts:
	docs/html/sdk/android-2.2.jd

Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438
 2010-07-12 17:30:05 -07:00
The Android Open Source Project
2cb8e28d39 merge from open-source master 
Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e
 2010-07-12 15:35:31 -07:00
The Android Open Source Project
6c09cab6ed merge from open-source master 
Change-Id: I3af7e5270229f9fc6c57c9449052025af2a9bdca
 2010-07-12 15:28:22 -07:00
The Android Open Source Project
0e10c129b9 merge from open-source master 
Change-Id: I992e2a407b1d8f7f29cb7153d4c2e3945e60b57a
 2010-07-12 15:26:21 -07:00
The Android Open Source Project
772706fe45 merge from open-source master 
Change-Id: Ib01b5c62c229817b6620692a8ae0211230813899
 2010-07-12 15:21:50 -07:00
Robert Ly
267569494f am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'b10080106909fd860ed33ac46de9f2f084e358d6' into gingerbread-plus-aosp

* commit 'b10080106909fd860ed33ac46de9f2f084e358d6':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:11:25 -07:00
Robert Ly
cee6103d08 am ef13d028: docchange: fixed typo "Pacskage" to "Package" 
Merge commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f' into gingerbread

* commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f':
  docchange: fixed typo "Pacskage" to "Package"
 2010-07-12 15:07:40 -07:00
David Brown
2787a7cfe6 am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread 
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp

* commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540':
  Deprecate some status bar icons that now come from the phone app (and
 2010-07-12 13:32:54 -07:00
David Brown
188d3b0a28 Merge "Deprecate some status bar icons that now come from the phone app (and shouldn't have been public in the first place.)" into gingerbread 2010-07-12 13:30:58 -07:00
Romain Guy
3e57d20b63 Merge "Fixed a Documentation Error in the AsyncTask Contstructor" 2010-07-12 11:35:31 -07:00
Kenny Root
723499ae23 am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread 
Merge commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd' into gingerbread-plus-aosp

* commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
 2010-07-12 11:20:04 -07:00
Kenny Root
9baa2c7a44 Merge changes I2337051b,I19b426cb into gingerbread 
* changes:
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
 2010-07-12 11:18:34 -07:00
Jean-Baptiste Queru
4d360bae07 Merge "Fix hang when error in SIM card communication" 2010-07-12 11:14:56 -07:00
Jean-Baptiste Queru
8b620f3457 Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
34cc65ebb4 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Kenny Root
fa59afb863 Tweak ObbFile class 
* Move error messages around to clarify the errors.

* Add extra error check when reading a file.

* Seek to the end of a file when writing the signature so the users of
  the API don't have to remember to do it.

Change-Id: I2337051b9f9fa8147c5900237deec790dcd92436
 2010-07-12 09:11:24 -07:00
Dianne Hackborn
7b48b5f6c8 am faccac76: Make a stupid thing about the glue less stupid. 
Merge commit 'faccac7616795859af257777900db514d425a106' into gingerbread-plus-aosp

* commit 'faccac7616795859af257777900db514d425a106':
  Make a stupid thing about the glue less stupid.
 2010-07-09 18:27:51 -07:00
Dianne Hackborn
c9ab2f8f90 am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits. 
Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp

* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
  Add ANativeWindow API for directly drawing to the surface bits.
 2010-07-09 17:03:14 -07:00
Dianne Hackborn
9147d11a5f Add ANativeWindow API for directly drawing to the surface bits. 
Also other cleanup and fixes:

- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.

Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
 2010-07-09 16:58:19 -07:00
The Android Open Source Project
2196401413 merge from open-source master 
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
 2010-07-09 15:59:17 -07:00
The Android Open Source Project
3ab3e72b1c merge from open-source master 
Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3
 2010-07-09 15:56:45 -07:00
The Android Open Source Project
4e8d825370 ignore from open-source master 
Change-Id: I8f474f33c225416242421db0ff6c08267d4ce002
 2010-07-09 15:50:11 -07:00
Jean-Baptiste Queru
57c87d26a8 Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
David Brown
47d7b17f21 am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread 
Merge commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a' into gingerbread-plus-aosp

* commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a':
  Remove some (unused, non-public) phone-related status bar notification icons
 2010-07-09 13:00:00 -07:00
David Brown
4865402092 Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread 2010-07-09 12:57:39 -07:00
Jean-Michel Trivi
29a2fa2eb0 am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp

* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
  Fix swap of sessionId and output in audio effect API.
 2010-07-09 12:32:21 -07:00
Jean-Michel Trivi
5b8e7a6da2 Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 2010-07-09 12:30:28 -07:00
James Dong
ff1573dcc7 am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 
Merge commit '6bb14e08da82e72197f35548ff77a2f817c52a58' into gingerbread-plus-aosp

* commit '6bb14e08da82e72197f35548ff77a2f817c52a58':
  Enable the support for decoding audio with AAC+ and eAAC+ features
 2010-07-09 11:41:08 -07:00
James Dong
e133ad9828 Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 2010-07-09 11:38:45 -07:00
Daniel Sandler
b9a74ef132 am f99e27da: Merge "Make android:immersive public." into gingerbread 
Merge commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc' into gingerbread-plus-aosp

* commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc':
  Make android:immersive public.
 2010-07-09 06:10:26 -07:00
Daniel Sandler
5ac1d3acf8 Merge "Make android:immersive public." into gingerbread 2010-07-09 06:07:51 -07:00
James Dong
0f8bda9860 am 929642ee: Add runtime dumpsys support for media recorder client 
Merge commit '929642ee003895b6e4e85ad7e43c7c6f01b29020' into gingerbread-plus-aosp

* commit '929642ee003895b6e4e85ad7e43c7c6f01b29020':
  Add runtime dumpsys support for media recorder client
 2010-07-08 21:37:43 -07:00
Jean-Baptiste Queru
e02daf9c05 Merge "update 404'd source.android.com URLs" 2010-07-08 16:25:03 -07:00
Eric Laurent
d6f55cbd78 am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects. 
Merge commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2' into gingerbread-plus-aosp

* commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2':
  Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
 2010-07-08 16:14:31 -07:00
Brett Chabot
35362d4734 am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread 
Merge commit 'f6120cf431804e072f34699a5d8a3fae62492cee' into gingerbread-plus-aosp

* commit 'f6120cf431804e072f34699a5d8a3fae62492cee':
  Improve InstrumentationTestRunner exception handling.
 2010-07-08 14:12:10 -07:00
Brett Chabot
0ec4ce7696 Merge "Improve InstrumentationTestRunner exception handling." into gingerbread 2010-07-08 14:09:21 -07:00
Dianne Hackborn
cf9bd8d743 am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread 
Merge commit '74bf59b450daf9e7e6bf234f01db164099edbfd5' into gingerbread-plus-aosp

* commit '74bf59b450daf9e7e6bf234f01db164099edbfd5':
  Add new glue code for writing native apps.
 2010-07-08 12:26:32 -07:00
Dianne Hackborn
5234c75f9b Merge "Add new glue code for writing native apps." into gingerbread 2010-07-08 12:25:20 -07:00
Jason Parks
ceef3d19a4 am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread 
Merge commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f' into gingerbread-plus-aosp

* commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
 2010-07-08 11:52:01 -07:00
Jason Parks
a0495e420c Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread 2010-07-08 11:50:40 -07:00
Scott Main
7b76d565d4 am 833830e0: am 286cf139: docs: add redirect for download.html 
Merge commit '833830e0640cd25dcf3ed29ea5a9bd835caded13' into gingerbread-plus-aosp

* commit '833830e0640cd25dcf3ed29ea5a9bd835caded13':
  docs: add redirect for download.html
 2010-07-08 11:42:53 -07:00
Scott Main
ba6c627d06 am 286cf139: docs: add redirect for download.html 
Merge commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62' into gingerbread

* commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62':
  docs: add redirect for download.html
 2010-07-08 11:40:11 -07:00