Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,624 Commits 3 Branches 0 Tags
f6bdc764b7a21f8037504e1dc4f81227ea2bedea
Commit Graph

24624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
f6bdc764b7 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
9d8bea1189 Merge "Initial checkin for software AVC encoder" into gingerbread 2010-07-13 10:59:34 -07:00
James Dong
1cc31e629e Initial checkin for software AVC encoder 
- Since the software encoder assumes the input is YUV420 planar,
  color conversion needs to be added when the input color format
  does not meet the requirement. With this patch, I only added
  a single color conversion from YUV420 semi planar to YUV420
  planar. We can add more as we go.

Change-Id: If8640c9e5a4f73d385ae9bb2022e57f7f62b91b9
 2010-07-13 10:58:20 -07:00
Joe Malin
95ccd87582 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
d93f4e5b70 Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread 2010-07-13 09:46:38 -07:00
Dianne Hackborn
b0e787d2d6 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
e339464f1c 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
1bcb665825 Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 2010-07-12 19:03:26 -07:00
Dirk Dougherty
6ba9e6fbef 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
5a93032dcb 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
Dianne Hackborn
24117ce3ae Fix issue #2834005: Android Settings.Secure bypass 
Change-Id: Ic4f14e2ff5c2b4f623405d30389863a9e3e82572
 2010-07-12 17:21:50 -07:00
Dirk Dougherty
3c691a8d7f Doc change: add notes for ndk r4b. 
Change-Id: Idf4e4d2ac2ed9c30b3afe258546861084f3f20aa
 2010-07-12 15:51:01 -07:00
The Android Open Source Project
7b1a207922 merge from open-source master 
Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e
 2010-07-12 15:35:31 -07:00
The Android Open Source Project
f079a65977 merge from open-source master 
Change-Id: I3af7e5270229f9fc6c57c9449052025af2a9bdca
 2010-07-12 15:28:22 -07:00
The Android Open Source Project
b65d225633 merge from open-source master 
Change-Id: I992e2a407b1d8f7f29cb7153d4c2e3945e60b57a
 2010-07-12 15:26:21 -07:00
The Android Open Source Project
6fb70b5a9f merge from open-source master 
Change-Id: Ib01b5c62c229817b6620692a8ae0211230813899
 2010-07-12 15:21:50 -07:00
Robert Ly
f9a71640b8 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
b100801069 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
Robert Ly
ef13d02821 docchange: fixed typo "Pacskage" to "Package" 
Change-Id: I6004dc7743dcd74315cbfc2cccc306ff8724e569
 2010-07-12 14:55:59 -07:00
David Brown
523959f50e 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
d1af902c21 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
2594066787 Merge "Fixed a Documentation Error in the AsyncTask Contstructor" 2010-07-12 11:35:31 -07:00
Kenny Root
ceb8465e97 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
87bb18579a 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
014568bf45 Merge "Fix hang when error in SIM card communication" 2010-07-12 11:14:56 -07:00
Christian Mehlmauer
b91a4c4f23 Fixed a Documentation Error in the AsyncTask Contstructor 
Change-Id: Ic5fb9c613b9e358f1ea81996ee705831a77368db
 2010-07-12 20:02:25 +02:00
Jean-Baptiste Queru
f0565ce75a Merge "Reduced Warnings by adding Type Arguments and removing unused imports" 2010-07-12 10:54:11 -07:00
Jean-Baptiste Queru
ac95a25409 Merge "Documentation Bug (Issue 9557)" 2010-07-12 10:43:17 -07:00
Kenny Root
87315aa1f0 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
Kenny Root
e059b2784f Allow things that can install packages to set Obb paths 
Change-Id: I19b426cb3de1a5c9285badf8aea59989568914b4
 2010-07-12 08:36:21 -07:00
Dianne Hackborn
bbf0bde5d8 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
faccac7616 Make a stupid thing about the glue less stupid. 
There is no reason to make the app developer delete the
glue.  Seriously.

Change-Id: Ic6a93ba17b44889783b35a2a0a2b67ffcd647f47
 2010-07-09 18:20:09 -07:00
Dianne Hackborn
b14f325a01 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
289b9b6237 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
David Brown
26c679751d Deprecate some status bar icons that now come from the phone app (and 
shouldn't have been public in the first place.)

(And since the changed deprecation state is a public API change, I needed
to do "make update-api" as well.)

Change-Id: I803d5a81ad2363561137be5af4f2b8258df758cd
 2010-07-09 16:01:25 -07:00
The Android Open Source Project
0260887ca7 merge from open-source master 
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
 2010-07-09 15:59:17 -07:00
The Android Open Source Project
990d9ca416 merge from open-source master 
Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3
 2010-07-09 15:56:45 -07:00
The Android Open Source Project
3dbbf2dc21 ignore from open-source master 
Change-Id: I8f474f33c225416242421db0ff6c08267d4ce002
 2010-07-09 15:50:11 -07:00
Jean-Baptiste Queru
eb678fb63d Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
David Brown
d321e8d688 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
2aaa9e9fc5 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
bd3f8b7116 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
e7b790f1f7 Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 2010-07-09 12:30:28 -07:00
Jean-Michel Trivi
4cb15cf15d Fix swap of sessionId and output in audio effect API. 
Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
 2010-07-09 12:11:49 -07:00
James Dong
a60337ce57 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
6bb14e08da Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 2010-07-09 11:38:45 -07:00
Daniel Sandler
339716e03c 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
f99e27da0b Merge "Make android:immersive public." into gingerbread 2010-07-09 06:07:51 -07:00
James Dong
a7c14078af Enable the support for decoding audio with AAC+ and eAAC+ features 
bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
 2010-07-08 21:37:46 -07:00
James Dong
4f4406322d 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