drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,104 Commits 1 Branch 0 Tags
Commit Graph

23104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
072f5247ef Support for media extraction from .mkv/.mka Matroska files in stagefright. 
Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
 2010-05-20 14:56:53 -07:00
Andreas Huber
c6a1632732 am 3c16154a: am 2723e092: Merge "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." into froyo 
Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
  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.
 2010-05-20 11:14:37 -07:00
Andreas Huber
3c16154a33 am 2723e092: Merge "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." into froyo 
Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp

* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
  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.
 2010-05-20 11:13:20 -07:00
Andreas Huber
2723e09229 Merge "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." into froyo 2010-05-20 11:11:39 -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
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
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
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
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
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
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
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
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
66c46a6bd1 added RWLock C++ wrapper 
Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
 2010-05-19 15:12:59 -07:00
James Dong
4414b9ad54 Merge "Initial software encoder checkins" into kraken 2010-05-19 13:14:24 -07:00
Wink Saville
7e3b31d786 Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken 2010-05-19 13:05:55 -07:00
Scott Main
f5172c555f am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo 
Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken

* commit '8bf77456cec82cbda3393a4e48f265af1670e795':
  docs: revise platform intro
 2010-05-19 12:11:03 -07:00
Scott Main
8bf77456ce am 8d0e37f5: Merge "docs: revise platform intro" into froyo 
Merge commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp

* commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
  docs: revise platform intro
 2010-05-19 12:09:04 -07:00
Scott Main
8d0e37f5b1 Merge "docs: revise platform intro" into froyo 2010-05-19 12:05:52 -07:00
Scott Main
0a9cb85a5c docs: revise platform intro 
Change-Id: Ie1ff802179b3a2614bee78ca321db8dd064dbc7c
 2010-05-19 11:53:33 -07:00
The Android Open Source Project
b32a74c73b am ee1cdd0e: merge from open-source master 
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken

* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
  Don't allow invalid Uris to be added as observers.
 2010-05-19 09:43:20 -07:00
The Android Open Source Project
37b0da26fc am 2b544c9f: merge from open-source master 
Merge commit '2b544c9f0ea139d052664be0be465c2315707081' into kraken

* commit '2b544c9f0ea139d052664be0be465c2315707081':
  Fix isssue 2548710: Native AudioTrack resources never freed.
 2010-05-19 09:37:21 -07:00
The Android Open Source Project
ee1cdd0e60 merge from open-source master 
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
 2010-05-19 09:36:55 -07:00
The Android Open Source Project
2b544c9f0e merge from open-source master 
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
 2010-05-19 09:32:44 -07:00
The Android Open Source Project
bea97a897b am 2dc7c6c4: merge from open-source master 
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken

* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
  Add and document .nomedia constant for MediaStore (Issue 6365)
 2010-05-19 09:22:21 -07:00
The Android Open Source Project
2dc7c6c415 merge from open-source master 
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
 2010-05-19 09:20:22 -07:00
Wink Saville
a4f3bec29c Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage. 
The EBNF statemachine description language was to difficult
to remember changed to use a simpler and more obvious psuedo
language.

Added HANDLED and NOT_HANDLED as it makes the psuedo code
more obvious.

Added getCurrentMessage primarily for use by code in enter
so that it can know why the new state is being entered.

Change-Id: I1446e417b77684fbde0020b1da0975eedc57cce4
 2010-05-19 09:11:38 -07:00
Romain Guy
bcb62f099a Merge "Don't allow invalid Uris to be added as observers." 2010-05-19 09:03:57 -07:00
The Android Open Source Project
b39b0f32d1 am faf9a783: merge from open-source master 
Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken

* commit 'faf9a78363b0c773b95c9b43263d788aee313054':
  Text disappears when selecting text in text editor.
 2010-05-19 08:41:26 -07:00
The Android Open Source Project
faf9a78363 merge from open-source master 
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
 2010-05-19 08:39:13 -07:00
Jean-Baptiste Queru
a3e7645514 Merge "Fix isssue 2548710: Native AudioTrack resources never freed." 2010-05-19 08:35:21 -07:00
The Android Open Source Project
627356cee4 am d6c0bb0f: merge from open-source master 
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken

* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
  Removed Calls to deprecated APIs
 2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f merge from open-source master 
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
 2010-05-19 08:28:32 -07:00
The Android Open Source Project
0b6defefb9 am aa2fe148: merge from open-source master 
Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken

* commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934':
  Improved error handling when font loading fails.
 2010-05-19 08:21:54 -07:00
The Android Open Source Project
aa2fe14849 merge from open-source master 
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
 2010-05-19 08:15:54 -07:00
James Dong
17299ab50c Initial software encoder checkins 
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
 2010-05-19 07:21:25 -07:00