summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added the notion of fixed-size buffersMathias Agopian2010-05-2411-93/+273
| | | | | | | | | the new native_window_set_buffers_geometry allows to specify a size and format for all buffers to be dequeued. the buffer will be scalled to the window's size. Change-Id: I2c378b85c88d29cdd827a5f319d5c704d79ba381
* fix a bug when reallocating a window's buffers is neededMathias Agopian2010-05-242-2/+3
| | | | | | | we need to mark the buffers that need to be reallocated, NOT the buffer's indices. Change-Id: I809e2e1b03b56c4d2ab983c25523dae99aa1da74
* Merge "Add Geocorder.isImplemented()" into krakenMike Lockwood2010-05-240-0/+0
|\
* \ Merge "Properly handle start code in H264/AVC encoder output" into krakenJames Dong2010-05-240-0/+0
|\ \
* \ \ am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.Dirk Dougherty2010-05-240-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken * commit '3cffe1ababdb09f4a90274e25c2f66feee299835': Doc change: Fix incorrect adt version reference etc.
| * \ \ am c7c7afd7: Doc change: Fix incorrect adt version reference etc.Dirk Dougherty2010-05-240-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp * commit 'c7c7afd7a1af36e787266815487f4600196406b8': Doc change: Fix incorrect adt version reference etc.
* | \ \ \ Merge "New shadowy status bar, direct from Z'ha'dum." into krakenDaniel Sandler2010-05-240-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge "Disable CameraServiceTest in a normal build." into krakenChih-Chung Chang2010-05-231-1/+3
|\ \ \ \ \ \
| * | | | | | Disable CameraServiceTest in a normal build.Chih-Chung Chang2010-05-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18dfcb073e6a8e72ad35f47d6884f5f2f62d3dca
* | | | | | | added native_window_set_buffer_count()Mathias Agopian2010-05-215-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this method can be used to change the number of buffers associated to a native window. the default is two. Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
* | | | | | | Merge "fix the threading issue for setBuffercount()" into krakenMathias Agopian2010-05-2115-186/+273
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix the threading issue for setBuffercount()Mathias Agopian2010-05-2015-186/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this change introduces R/W locks in the right places. on the server-side, it guarantees that setBufferCount() is synchronized with "retire" and "resize". on the client-side, it guarantees that setBufferCount() is synchronized with "dequeue", "lockbuffer" and "queue"
* | | | | | | Merge "Fix broken Javadoc links" into krakenMike Lockwood2010-05-210-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Report number of satellites used in fix instead of total for GPS ↵Mike Lockwood2010-05-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | Location extra" into kraken
* | | | | | Merge "Unhide new location manager APIs:" into krakenMike Lockwood2010-05-210-0/+0
|\ \ \ \ \ \ | |/ / / / /
* | | | | | Merge "New Location Manager APIs for Criteria based requests and single shot ↵Mike Lockwood2010-05-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | mode." into kraken
* | | | | | Merge "Support for media extraction from .mkv/.mka Matroska files in ↵Andreas Huber2010-05-210-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | stagefright." into kraken
* | | | | | Merge "Update software AVC decoder to no longer require the ↵Andreas Huber2010-05-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | kWantsNALFragments hack." into kraken
* | | | | | Merge "Workaround for preview frame rate setting and encoder profile and ↵James Dong2010-05-200-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974" into kraken
* | | | | | am 3c16154a: am 2723e092: Merge "Better handling of codec initialization ↵Andreas Huber2010-05-200-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | am 2723e092: Merge "Better handling of codec initialization failure in the ↵Andreas Huber2010-05-200-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Merge "Better handling of codec initialization failure in the player and ↵Andreas Huber2010-05-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
* | | | | | am 3716ea04: am 06906796: If the network SSID is a string, it should be ↵Xia Wang2010-05-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | am 06906796: If the network SSID is a string, it should be enclosed in ↵Xia Wang2010-05-200-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge "Fix javadoc of camera focus distances API." into krakenWu-cheng Li2010-05-200-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.Dirk Dougherty2010-05-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | Merge commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken * commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf': Doc change: Add new tv to carousel.
| * | | | | am dc737ca9: Doc change: Add new tv to carousel.Dirk Dougherty2010-05-200-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp * commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6': Doc change: Add new tv to carousel.
* | | | | | am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into ↵Scott Main2010-05-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo Merge commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken * commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac': docs: add youtube video to highlights
| * | | | | am 55f383a9: Merge "docs: add youtube video to highlights" into froyoScott Main2010-05-190-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp * commit '55f383a9b8da99aa48857fea27a35badc515d8bd': docs: add youtube video to highlights
| | * | | | Merge "docs: add youtube video to highlights" into froyoScott Main2010-05-190-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to ↵Scott Main2010-05-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backup guide" into froyo Merge commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken * commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926': doc: add developing and testing info to backup guide
| * | | | | | am 80259899: Merge "doc: add developing and testing info to backup guide" ↵Scott Main2010-05-190-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp * commit '8025989957e5b6ad51e99a69a0e1e753e40cba67': doc: add developing and testing info to backup guide
| | * | | | | Merge "doc: add developing and testing info to backup guide" into froyoScott Main2010-05-190-0/+0
| | |/ / / /
* | | | | | am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher ↵Dirk Dougherty2010-05-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | am 44108b54: Doc change: Move framework api change info higher in platform ↵Dirk Dougherty2010-05-190-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | am fa6ee245: am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-190-0/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | Merge commit 'fa6ee245c7010101d87194b00f34ea3448053f28' into kraken * commit 'fa6ee245c7010101d87194b00f34ea3448053f28': docs: add 2.2 platform highlights
| * | | am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-190-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp * commit '68728cb3b44aba16abc298a37f6110ed00a781dd': docs: add 2.2 platform highlights
* | | | added RWLock C++ wrapperMathias Agopian2010-05-191-0/+90
| | | | | | | | | | | | | | | | Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
* | | | Merge "Initial software encoder checkins" into krakenJames Dong2010-05-190-0/+0
|\ \ \ \
* \ \ \ \ Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into krakenWink Saville2010-05-190-0/+0
|\ \ \ \ \ | |/ / / /
* | | | | am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyoScott Main2010-05-190-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken * commit '8bf77456cec82cbda3393a4e48f265af1670e795': docs: revise platform intro
| * | | | am 8d0e37f5: Merge "docs: revise platform intro" into froyoScott Main2010-05-190-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp * commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f': docs: revise platform intro
| | * | | Merge "docs: revise platform intro" into froyoScott Main2010-05-190-0/+0
| | |\ \ \
* | | \ \ \ am ee1cdd0e: merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken * commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed': Don't allow invalid Uris to be added as observers.
| * | | | | merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
| | * \ \ \ \ Merge "Don't allow invalid Uris to be added as observers."Romain Guy2010-05-190-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am 2b544c9f: merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2b544c9f0ea139d052664be0be465c2315707081' into kraken * commit '2b544c9f0ea139d052664be0be465c2315707081': Fix isssue 2548710: Native AudioTrack resources never freed.
| * | | | | | | merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
| | * | | | | | Merge "Fix isssue 2548710: Native AudioTrack resources never freed."Jean-Baptiste Queru2010-05-191-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix isssue 2548710: Native AudioTrack resources never freed.Eric Laurent2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle is destroyed, the corresponding Track will remain active as long as frames are ready for mixing. If the track uses shared memory (static mode) and the sound is looped, this track will play for ever. The fix consists in removing the track from active list immediately if the track is terminated. Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2