24320 Commits

Author SHA1 Message Date
Xia Wang
1753050811 am cf7d2d50: am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks. 2010-05-20 11:00:22 -07:00
Xia Wang
cf7d2d50a4 am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken

* commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
  If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:58:18 -07:00
Xia Wang
3716ea04d9 am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp

* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
  If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:56:13 -07:00
Andreas Huber
1919e5af3d Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4
related-to-bug: 2699505
2010-05-20 10:37:06 -07:00
Xia Wang
069067963c If the network SSID is a string, it should be enclosed in double quotation marks.
bug id: 2701058

Change-Id: I40e10ba096053710d4974b005d0d2e7c309ccffe
2010-05-20 10:22:59 -07:00
Wu-cheng Li
ee714613e8 am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken 2010-05-20 01:50:23 -07:00
Wu-cheng Li
2ee95ad696 am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken 2010-05-20 01:48:26 -07:00
Wu-cheng Li
5badcabadb Merge "Fix javadoc of camera focus distances API." into kraken 2010-05-20 01:46:51 -07:00
Wu-cheng Li
185cc455a8 Fix javadoc of camera focus distances API.
bug:1955650
Change-Id: I073eb533dd1d5fcebbaa430de9af2bf4335c406e
2010-05-20 16:33:51 +08:00
Dirk Dougherty
a347d4ba47 am b482577a: am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel. 2010-05-20 00:21:00 -07:00
Dirk Dougherty
b482577a1b am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel. 2010-05-20 00:18:57 -07:00
Dirk Dougherty
a6638606c2 am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.
Merge commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken

* commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf':
  Doc change: Add new tv to carousel.
2010-05-20 00:17:14 -07:00
Dirk Dougherty
41a254cf1b am dc737ca9: Doc change: Add new tv to carousel.
Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp

* commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6':
  Doc change: Add new tv to carousel.
2010-05-20 00:15:41 -07:00
Dirk Dougherty
dc737ca986 Doc change: Add new tv to carousel.
Change-Id: Ibd36247bbab26d8d4a8e8c15a1d852a2f9cb0269
2010-05-19 23:50:10 -07:00
Dianne Hackborn
cddfa6de1f Fix sdk build.
Change-Id: I4106de6c85d69a68d80414db5dbf5cf48685ce54
2010-05-19 22:56:37 -07:00
Romain Guy
df36b0579e Prevent crash when changing adapter.
Bug #2697842

Change-Id: I3f94c7907c8881145638b9e9307458f1431d7e57
2010-05-19 21:16:02 -07:00
Scott Main
cc92cea8fa am 5619e3ad: am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:31:03 -07:00
Scott Main
5619e3ad27 am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:29:31 -07:00
Scott Main
1442290ad4 am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken

* commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac':
  docs: add youtube video to highlights
2010-05-19 20:27:21 -07:00
Scott Main
cf7579148a am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp

* commit '55f383a9b8da99aa48857fea27a35badc515d8bd':
  docs: add youtube video to highlights
2010-05-19 20:25:15 -07:00
Scott Main
55f383a9b8 Merge "docs: add youtube video to highlights" into froyo 2010-05-19 20:24:18 -07:00
Scott Main
2324abdb3c docs: add youtube video to highlights
Change-Id: Ib498ab7e18d6e54df35009b4255fce96f11bcb39
2010-05-19 20:16:06 -07:00
Scott Main
f1b59b7e67 am 67d8dce3: am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo 2010-05-19 19:35:12 -07:00
Scott Main
67d8dce31c am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo 2010-05-19 19:33:44 -07:00
Scott Main
fa966de213 am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken

* commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926':
  doc: add developing and testing info to backup guide
2010-05-19 19:32:25 -07:00
Scott Main
864c3d1b90 am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp

* commit '8025989957e5b6ad51e99a69a0e1e753e40cba67':
  doc: add developing and testing info to backup guide
2010-05-19 19:30:29 -07:00
Scott Main
8025989957 Merge "doc: add developing and testing info to backup guide" into froyo 2010-05-19 19:29:19 -07:00
Dianne Hackborn
5ae74d6e89 More fragment work.
Clean up FragmentTransaction API, add more animation control, add new
Fragment APIs for hiding and showing.

Change-Id: Iffe31351024a7a63d164270b8a955a499076600e
2010-05-19 19:25:38 -07:00
Scott Main
371557fabd doc: add developing and testing info to backup guide
Change-Id: I1e9c9f412033ecf517ea566ce70686f42e7c568e
2010-05-19 19:17:47 -07:00
Dirk Dougherty
6cf8b9a3ea am f9a1ebe5: am 568f9305: am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc. 2010-05-19 19:03:54 -07:00
Dirk Dougherty
f9a1ebe5c8 am 568f9305: am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc. 2010-05-19 19:02:13 -07:00
Dirk Dougherty
568f930559 am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
Merge commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07' into kraken

* commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07':
  Doc change: Move framework api change info higher in platform notes documents.
2010-05-19 18:59:57 -07:00
Dirk Dougherty
1eb4a9d8e9 am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
Merge commit '44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp

* commit '44108b54543c87e2c46a6d5d4339b3c4e06373de':
  Doc change: Move framework api change info higher in platform notes documents.
2010-05-19 18:58:03 -07:00
Jason Sams
0a70b8a638 Merge "Begin naming cleanup for renderscript runtime. Prefix functions with "rs" or "rsg"." 2010-05-19 18:56:00 -07:00
Dirk Dougherty
44108b5454 Doc change: Move framework api change info higher in platform notes documents.
Small adjustment to compatibility doc.

Change-Id: I2af896292b00323d7f4eb2c828c8dea36b9e94ad
2010-05-19 18:22:04 -07:00
Scott Main
a3c76f2d5b am 868dbc89: am 8db443d3: am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights 2010-05-19 18:12:04 -07:00
Scott Main
868dbc8963 am 8db443d3: am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights 2010-05-19 18:10:22 -07:00
Scott Main
8db443d3a0 am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights
Merge commit 'fa6ee245c7010101d87194b00f34ea3448053f28' into kraken

* commit 'fa6ee245c7010101d87194b00f34ea3448053f28':
  docs: add 2.2 platform highlights
2010-05-19 18:08:34 -07:00
Scott Main
fa6ee245c7 am 68728cb3: docs: add 2.2 platform highlights
Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp

* commit '68728cb3b44aba16abc298a37f6110ed00a781dd':
  docs: add 2.2 platform highlights
2010-05-19 18:06:51 -07:00
Scott Main
68728cb3b4 docs: add 2.2 platform highlights
Change-Id: I43bcdad9dbea11bfcc30eadac1ef91a2e5982df8
2010-05-19 17:42:02 -07:00
Mathias Agopian
6b72dbe9c3 am 225eb7b5: am 66c46a6b: added RWLock C++ wrapper 2010-05-19 17:31:57 -07:00
Mathias Agopian
225eb7b5fa am 66c46a6b: added RWLock C++ wrapper 2010-05-19 17:29:57 -07:00
Jason Sams
d79b2e9f8b Begin naming cleanup for renderscript runtime.
Prefix functions with "rs" or "rsg".

Change-Id: I4435b486831bfab1ea473ccfad435b404e68f1c9
2010-05-19 17:23:08 -07:00
Alex Sakhartchouk
d52498a64f Merge "Added benchmark mode. Added some image processing operations." 2010-05-19 16:44:26 -07:00
Alex Sakhartchouk
814326b3b9 Added benchmark mode.
Added some image processing operations.

Change-Id: Ic7ba45fbf57eff6fc7d20377c148d0ba7ac862f7
2010-05-19 16:28:27 -07:00
Vasu Nori
8e5819662f Merge "DatabaseCorruptionHandler causes NPE" 2010-05-19 15:20:29 -07:00
Mathias Agopian
66c46a6bd1 added RWLock C++ wrapper
Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
2010-05-19 15:12:59 -07:00
Vasu Nori
85f08f9eae DatabaseCorruptionHandler causes NPE
it is trying to get attachedDb list (by executing a pragma) after closing
the database.
also added unittests.

Change-Id: I7dce665ec7354402cdef6fbe055455f5798e123c
2010-05-19 13:55:09 -07:00
James Dong
e24a605d51 am 84b6cd92: am 4414b9ad: Merge "Initial software encoder checkins" into kraken 2010-05-19 13:18:16 -07:00
James Dong
84b6cd92fb am 4414b9ad: Merge "Initial software encoder checkins" into kraken 2010-05-19 13:16:09 -07:00