summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Workaround for preview frame rate setting and encoder profile and level ↵James Dong2010-05-202-4/+2
| | | | | | | | | 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 Change-Id: Id01d94bb77dc242c4712d56a91b0d69a96ba6c2f
* am fa6ee245: am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
|\ | | | | | | | | | | | | Merge commit 'fa6ee245c7010101d87194b00f34ea3448053f28' into kraken * commit 'fa6ee245c7010101d87194b00f34ea3448053f28': docs: add 2.2 platform highlights
| * am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
| |\ | | | | | | | | | | | | | | | | | | Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp * commit '68728cb3b44aba16abc298a37f6110ed00a781dd': docs: add 2.2 platform highlights
| | * docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
| | | | | | | | | | | | Change-Id: I43bcdad9dbea11bfcc30eadac1ef91a2e5982df8
* | | added RWLock C++ wrapperMathias Agopian2010-05-191-0/+90
| | | | | | | | | | | | Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
* | | Merge "Initial software encoder checkins" into krakenJames Dong2010-05-19217-42/+44262
|\ \ \
| * | | Initial software encoder checkinsJames Dong2010-05-19217-42/+44262
| | | | | | | | | | | | | | | | Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
* | | | Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into krakenWink Saville2010-05-192-153/+165
|\ \ \ \
| * | | | Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage.Wink Saville2010-05-192-153/+165
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyoScott Main2010-05-191-3/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken * commit '8bf77456cec82cbda3393a4e48f265af1670e795': docs: revise platform intro
| * | | am 8d0e37f5: Merge "docs: revise platform intro" into froyoScott Main2010-05-191-3/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp * commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f': docs: revise platform intro
| | * | Merge "docs: revise platform intro" into froyoScott Main2010-05-191-3/+2
| | |\ \
| | | * | docs: revise platform introScott Main2010-05-191-3/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie1ff802179b3a2614bee78ca321db8dd064dbc7c
* | | | | am ee1cdd0e: merge from open-source masterThe Android Open Source Project2010-05-191-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
| | * \ \ \ Merge "Don't allow invalid Uris to be added as observers."Romain Guy2010-05-191-0/+3
| | |\ \ \ \
| | | * | | | Don't allow invalid Uris to be added as observers.Anthony Newnam2010-05-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a null segment is added, it will cause problems traversing the list at a later point. Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
* | | | | | | 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
* | | | | | | | am 2dc7c6c4: merge from open-source masterThe Android Open Source Project2010-05-192-0/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken * commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d': Add and document .nomedia constant for MediaStore (Issue 6365)
| * | | | | | | merge from open-source masterThe Android Open Source Project2010-05-192-0/+19
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
| | * | | | | | Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"Romain Guy2010-05-192-0/+19
| | |\ \ \ \ \ \
| | | * | | | | | Add and document .nomedia constant for MediaStore (Issue 6365)Karl Ostmo2010-05-172-0/+19
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ic9c4a784187cd1264584992411916a5beeefd864
* | | | | | | | am faf9a783: merge from open-source masterThe Android Open Source Project2010-05-191-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken * commit 'faf9a78363b0c773b95c9b43263d788aee313054': Text disappears when selecting text in text editor.
| * | | | | | | merge from open-source masterThe Android Open Source Project2010-05-191-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
| | * | | | | | Merge "Text disappears when selecting text in text editor."Romain Guy2010-05-191-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Text disappears when selecting text in text editor.Viktor Yakovel2010-04-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem appears when the user selects, copies and paste text and then selects text again. The second time text is selected, the copied text becomes visible in the text field. Change-Id: Iae19d1659f58ad2e1c6f1a98bdef8bbedabd447f
* | | | | | | | | am d6c0bb0f: merge from open-source masterThe Android Open Source Project2010-05-194-10/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken * commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa': Removed Calls to deprecated APIs
| * | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-194-11/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
| | * | | | | | | Merge "Removed Calls to deprecated APIs"Romain Guy2010-05-194-12/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Removed Calls to deprecated APIsChristian Mehlmauer2010-05-174-12/+5
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f9b6a8d3c8a050156a6cc7ea0eb9de33b82f79a
* | | | | | | | | am aa2fe148: merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken * commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934': Improved error handling when font loading fails.
| * | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-190-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
| | * | | | | | | Merge "Improved error handling when font loading fails."Romain Guy2010-05-181-0/+3
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Improved error handling when font loading fails.Peter Eliasson2010-04-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch, an application could trigger a platform crash by calling: Typeface typeface = Typeface.createFromFile(""); boolean isbold = typeface.isBold(); The crash occurs since the Skia error that occurs when font loading fails is not propagated. With this patch, the Typeface constructor throws an IllegalStateException when Skia fails to load the font (i.e. when the native instance is null). Change-Id: I1002b37b7b32840cb7eeef6819d2982cb18c9003
* | | | | | | | | Merge "disable emma instrumentation for framework, ext and services (DO NOT ↵Guang Zhu2010-05-182-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into kraken
| * | | | | | | | | disable emma instrumentation for framework, ext and services (DO NOT MERGE)Guang Zhu2010-05-182-1/+9
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When these libraries are instrumented with emma instructions, runtime keeps restarting on native crashes. To acheive a fully emma instrumented build, we need to disable emma instrumentation on these libraries. Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
* | | | | | | | | Merge "add execution permission to "input" script (DO NOT MERGE)" into krakenGuang Zhu2010-05-181-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add execution permission to "input" script (DO NOT MERGE)Guang Zhu2010-05-181-0/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although when building system image, "input" script will be given execution permission, adb sync will push a version without x onto device from build tree. Refer to frameworks/base/cmds/svc/svc, which has execution bit set. Change-Id: Ie82df2f0d3150c3df9498399f2c446f07ea89ca5
* | | | | | | | | Update NativeActivity to allow direct surface access.Dianne Hackborn2010-05-184-21/+261
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No actual native API for using a surface, but it's a step. Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
* | | | | | | | am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as ↵Suchi Amalapurapu2010-05-181-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STOPSHIP Add MediumTest tag" into froyo Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken * commit '7361b7410f2427022cc8917b00553dc26107cded': Uncomment a test that was marked as STOPSHIP
| * | | | | | | am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add ↵Suchi Amalapurapu2010-05-181-3/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediumTest tag" into froyo Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp * commit '4a0823e5486f16b10762076d629f2f7e4d5da476': Uncomment a test that was marked as STOPSHIP
| | * | | | | | Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into ↵Suchi Amalapurapu2010-05-181-3/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo
| | | * | | | | | Uncomment a test that was marked as STOPSHIPSuchi Amalapurapu2010-05-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MediumTest tag Change-Id: I0699d168d7ec70c076f4713e0e405c0779a290c6
* | | | | | | | | am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken * commit 'ea6f6755ce15133238938bd9626b69e5f655a49c': Removing STOPSHIP logs.
| * | | | | | | | am ef95aceb: Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp * commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2': Removing STOPSHIP logs.
| | * | | | | | | Merge "Removing STOPSHIP logs." into froyoJaikumar Ganesh2010-05-181-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Removing STOPSHIP logs.Jaikumar Ganesh2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2694602 Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
generated by cgit v1.1 at 2025-01-22 02:15:18 +0000