ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
4,657 Commits 2 Branches 0 Tags 54 MiB
93f11bd71e
Commit Graph

4657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
93f11bd71e am e1a9de7a: Merge change 24702 into eclair 
Merge commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d' into eclair-plus-aosp

* commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d':
  Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
 2009-09-11 10:20:33 -07:00
Android (Google) Code Review
76a4b2e8df Merge change 24702 into eclair 
* changes:
  Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
 2009-09-11 13:11:20 -04:00
Scott Main
c98e54616c am 764b0c6c: am 79253f8b: Merge change 24690 into donut 
Merge commit '764b0c6c66c9e093f246f5bf4085ee815557e034' into eclair-plus-aosp

* commit '764b0c6c66c9e093f246f5bf4085ee815557e034':
  docs only.
 2009-09-11 09:41:18 -07:00
Scott Main
0b1c3f6fb8 am a1103f33: am 890175db: Merge change 24574 into donut 
Merge commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69' into eclair-plus-aosp

* commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69':
  docs only.
 2009-09-11 09:41:12 -07:00
Dirk Dougherty
260e125606 am 40351ece: am 7350ff3d: Merge change 24631 into donut 
Merge commit '40351ecec878910d7f0ac6988cd8010dc82b0a99' into eclair-plus-aosp

* commit '40351ecec878910d7f0ac6988cd8010dc82b0a99':
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
 2009-09-11 09:32:43 -07:00
Dirk Dougherty
6012602a5b am 8a948de5: am 18dd1eeb: Merge change 24419 into donut 
Merge commit '8a948de56d8061659e04c70e5c6b34c9b6fb844b' into eclair-plus-aosp

* commit '8a948de56d8061659e04c70e5c6b34c9b6fb844b':
  Move API change details from highlights doc to version notes doc.
 2009-09-11 09:32:38 -07:00
Scott Main
0ed4a402f0 am 79253f8b: Merge change 24690 into donut 
Merge commit '79253f8b4223976c010e52a34e8785648c8fb074' into eclair

* commit '79253f8b4223976c010e52a34e8785648c8fb074':
  docs only.
 2009-09-11 09:32:26 -07:00
Scott Main
063c260f0a am 890175db: Merge change 24574 into donut 
Merge commit '890175db1f425cb92365cc7941c6c64544b2c164' into eclair

* commit '890175db1f425cb92365cc7941c6c64544b2c164':
  docs only.
 2009-09-11 09:32:19 -07:00
Android (Google) Code Review
eb0d54af99 Merge change 24690 into donut 
* changes:
  docs only. update japanese site homepage with 1.6 sdk links
 2009-09-11 12:27:49 -04:00
Android (Google) Code Review
0d3f6d4215 Merge change 24574 into donut 
* changes:
  docs only. revise the maxSdkVersion description
 2009-09-11 12:27:30 -04:00
Dirk Dougherty
070881674d am 7350ff3d: Merge change 24631 into donut 
Merge commit '7350ff3d572624abb5a46c3c4969e0b91cb05109' into eclair

* commit '7350ff3d572624abb5a46c3c4969e0b91cb05109':
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
 2009-09-11 09:25:45 -07:00
Dirk Dougherty
dd86ca9220 am 18dd1eeb: Merge change 24419 into donut 
Merge commit '18dd1eeb23a700ba37604d521d7eab8a371f9dc5' into eclair

* commit '18dd1eeb23a700ba37604d521d7eab8a371f9dc5':
  Move API change details from highlights doc to version notes doc.
 2009-09-11 09:25:38 -07:00
Android (Google) Code Review
32cf12a919 Merge change 24631 into donut 
* changes:
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
 2009-09-11 12:19:28 -04:00
Android (Google) Code Review
531f58b854 Merge change 24419 into donut 
* changes:
  Move API change details from highlights doc to version notes doc.
 2009-09-11 12:16:19 -04:00
Andreas Huber
efd49a478b am 6026a514: Move JPEGSource.{cpp,h} into libstagefright. 
Merge commit '6026a514248f0c603d0e8c4a3f542abab3fa1509' into eclair-plus-aosp

* commit '6026a514248f0c603d0e8c4a3f542abab3fa1509':
  Move JPEGSource.{cpp,h} into libstagefright.
 2009-09-11 09:13:38 -07:00
Tammo Spalink
ca61e80787 am d304ae58: Fix CDMA SMS delivery status reporting. 
Merge commit 'd304ae583d862250a21b5949fc3dbdf3af1febac' into eclair-plus-aosp

* commit 'd304ae583d862250a21b5949fc3dbdf3af1febac':
  Fix CDMA SMS delivery status reporting.
 2009-09-10 22:53:57 -07:00
Mathias Agopian
3c866cfa0e am f84a2182: Merge change 24643 into eclair 
Merge commit 'f84a21820b39dbfa983352b7d8ac949e560827d3' into eclair-plus-aosp

* commit 'f84a21820b39dbfa983352b7d8ac949e560827d3':
  fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
 2009-09-10 20:06:19 -07:00
Mathias Agopian
f9c18b1c79 am 12d2cdcd: Merge change 24642 into eclair 
Merge commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b' into eclair-plus-aosp

* commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b':
  make sure conditions will return when the status of a surface is not NO_ERROR
 2009-09-10 20:06:13 -07:00
Android (Google) Code Review
63a85fc420 Merge change 24643 into eclair 
* changes:
  fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
 2009-09-10 22:59:12 -04:00
Android (Google) Code Review
879a563130 Merge change 24642 into eclair 
* changes:
  make sure conditions will return when the status of a surface is not NO_ERROR
 2009-09-10 22:59:02 -04:00
Scott Main
aee29d97ce am 8905daa0: am cd419cf8: Merge change 24641 into donut 
Merge commit '8905daa06875a3f052c1eff5b0fbd14ab297cff7' into eclair-plus-aosp

* commit '8905daa06875a3f052c1eff5b0fbd14ab297cff7':
  docs only.
 2009-09-10 19:56:40 -07:00
Scott Main
6731d8c985 am cd419cf8: Merge change 24641 into donut 
Merge commit 'cd419cf89c552479bd382e3e0c554c84375f85f9' into eclair

* commit 'cd419cf89c552479bd382e3e0c554c84375f85f9':
  docs only.
 2009-09-10 19:51:37 -07:00
Android (Google) Code Review
ecc9f3e43e Merge change 24641 into donut 
* changes:
  docs only. change the japanese homepage Market link to go to the Market dev site instead of the English market promo site
 2009-09-10 22:46:35 -04:00
Scott Main
485860abd7 am f65bc182: am d27b1083: docs only. add Searchable resource information to the Available Resources doc and update some some of the attribute documentation to indicate that the icon label is not recommended. and fixing merge issue... 
Merge commit 'f65bc1823a8c09caab8237bf96323cf05df02287' into eclair-plus-aosp

* commit 'f65bc1823a8c09caab8237bf96323cf05df02287':
  docs only.
 2009-09-10 19:42:07 -07:00
Mathias Agopian
48d819a131 fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore 
this also fixes part of [2111536] Device is soft rebooted after ending the call through voice dialer
 2009-09-10 19:41:18 -07:00
Scott Main
8ecc703392 am d27b1083: docs only. add Searchable resource information to the Available Resources doc and update some some of the attribute documentation to indicate that the icon label is not recommended. and fixing merge issue... 
Merge commit 'd27b10837525f341eee7d46013e2177b0bad3c60' into eclair

* commit 'd27b10837525f341eee7d46013e2177b0bad3c60':
  docs only.
 2009-09-10 19:33:56 -07:00
Nick Pelly
b75a04b1b8 am 005b228c: API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API. 
Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp

* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
  API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
 2009-09-10 19:01:25 -07:00
Scott Main
70f4d775e9 am 9b6911cb: Merge change 24630 into eclair 
Merge commit '9b6911cb85a9c9a0fef145f91c9999da5a75ce21' into eclair-plus-aosp

* commit '9b6911cb85a9c9a0fef145f91c9999da5a75ce21':
  docs only.
 2009-09-10 18:34:08 -07:00
Android (Google) Code Review
d6594f7d38 Merge change 24630 into eclair 
* changes:
  resolved conflicts for merge of e0408aa1 to eclair
 2009-09-10 21:27:20 -04:00
Jim Miller
e4da5d407a am 38a1081c: Merge change 24514 into eclair 
Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp

* commit '38a1081cad9385073d80d358decf04f6b2fd5723':
  Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
 2009-09-10 18:19:29 -07:00
Robert Greenwalt
ad6d6101c9 am f3f72003: Merge change 24588 into eclair 
Merge commit 'f3f720031932500d92090b0093393651e7a713e0' into eclair-plus-aosp

* commit 'f3f720031932500d92090b0093393651e7a713e0':
  Fix for multi-apn MMS access.
 2009-09-10 18:19:24 -07:00
Android (Google) Code Review
09c5013b43 Merge change 24514 into eclair 
* changes:
  Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
 2009-09-10 21:12:11 -04:00
Android (Google) Code Review
c4df17dc73 Merge change 24588 into eclair 
* changes:
  Fix for multi-apn MMS access.
 2009-09-10 21:10:58 -04:00
Scott Main
1b188d7c96 resolved conflicts for merge of e0408aa1 to eclair 2009-09-10 18:08:37 -07:00
Jack Palevich
fef5026176 am ebebf9c3: Merge change 24618 into eclair 
Merge commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23' into eclair-plus-aosp

* commit 'ebebf9c36c0112d99cb2e11953febdff8ba5ff23':
  AGL's glCompressedTexImage2D now checks the imageSize parameter.
 2009-09-10 17:51:50 -07:00
Android (Google) Code Review
1d5ca47adf Merge change 24618 into eclair 
* changes:
  AGL's glCompressedTexImage2D now checks the imageSize parameter.
 2009-09-10 20:45:00 -04:00
Android (Google) Code Review
2a3617b023 Merge change 24559 into donut 
* changes:
  docs only. add documentation to notify developers about variable camera specifications and add some more links
 2009-09-10 20:17:52 -04:00
Jack Palevich
cfa316b9e7 AGL's glCompressedTexImage2D now checks the imageSize parameter. 
This parameter indicates how many bytes of the image data are valid.

Previously this parameter was ignored.
 2009-09-10 17:13:28 -07:00
Mathias Agopian
b58b5d72d6 make sure conditions will return when the status of a surface is not NO_ERROR 2009-09-10 16:55:13 -07:00
Christopher Tate
39c92b19f0 am 68f591b1: Merge change 24607 into eclair 
Merge commit '68f591b17537cb437ca0b25d00a6d3d08e507abb' into eclair-plus-aosp

* commit '68f591b17537cb437ca0b25d00a6d3d08e507abb':
  Try not to crash the system server because of corrupt restore data
 2009-09-10 16:22:15 -07:00
Android (Google) Code Review
1e6f58791a Merge change 24607 into eclair 
* changes:
  Try not to crash the system server because of corrupt restore data
 2009-09-10 19:13:52 -04:00
San Mehat
b01b3fc50f am 181b31a0: Process: Add support for using scheduler policies instead of cgroups. Preference is given to cgroups if available. 
Merge commit '181b31a0d87d525ea64102a965210331e0c6885b' into eclair-plus-aosp

* commit '181b31a0d87d525ea64102a965210331e0c6885b':
  Process: Add support for using scheduler policies instead of cgroups.
 2009-09-10 15:42:46 -07:00
Andreas Huber
9c268c7d35 am c06307cc: Merge change 24583 into eclair 
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp

* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
  Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
 2009-09-10 15:42:41 -07:00
San Mehat
9410f98e78 Process: Add support for using scheduler policies instead of cgroups. 
Preference is given to cgroups if available.

Signed-off-by: San Mehat <san@google.com>
 2009-09-10 15:09:38 -07:00
Android (Google) Code Review
476a3aef5e Merge change 24583 into eclair 
* changes:
  Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
 2009-09-10 18:08:08 -04:00
Wink Saville
404beefef7 am 88e3f827: Allow an alternate eri file. 
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp

* commit '88e3f827e657ef741099b24896c17533fa9ef61e':
  Allow an alternate eri file.
 2009-09-10 15:00:52 -07:00
Dianne Hackborn
37689cfea9 am e8f0603e: Merge change 24567 into eclair 
Merge commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8' into eclair-plus-aosp

* commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8':
  Fix issue #1943927: need notification in status bar when adb is active
 2009-09-10 14:30:53 -07:00
Romain Guy
5faf6ae4dd am 5b61bea7: Merge change 24581 into eclair 
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp

* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
  Dialog titles would sometimes use a font too large.
 2009-09-10 14:30:48 -07:00
Android (Google) Code Review
8b0bfdf70a Merge change 24567 into eclair 
* changes:
  Fix issue #1943927: need notification in status bar when adb is active
 2009-09-10 17:28:57 -04:00
Android (Google) Code Review
dd9edb0686 Merge change 24581 into eclair 
* changes:
  Dialog titles would sometimes use a font too large.
 2009-09-10 17:26:05 -04:00