Dirk Dougherty
2a053dc08d
Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 11:04:20 -07:00
Christopher Tate
1647a676f3
am 6ee412d5: Also dump system process threads halfway through the watchdog interval
...
Merge commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp
* commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
Also dump system process threads halfway through the watchdog interval
2010-05-28 12:50:05 -07:00
Kenny Root
085a308606
am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:35:25 -07:00
Dirk Dougherty
2c03020da7
am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
...
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:35:18 -07:00
Kenny Root
2baa0fbad3
Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:04:34 -07:00
Dirk Dougherty
f007f06d61
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 11:46:26 -07:00
Jeff Hamilton
9994e682f1
am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
...
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp
* commit 'dc46f6f6cc44954c23229019270b54b8912be825':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:40:23 -07:00
Jeff Hamilton
5b4069e958
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:39:19 -07:00
Irfan Sheriff
4a977bd462
am b3f3caef: Merge "Fix null pointer exception" into froyo
...
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
2010-05-26 21:34:52 -07:00
Irfan Sheriff
cde682745c
Merge "Fix null pointer exception" into froyo
2010-05-26 21:32:29 -07:00
Dirk Dougherty
58fccc44cd
am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
...
Merge commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp
* commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e':
Doc change: Suggest min keysize of 2048 for keys.
2010-05-26 18:33:05 -07:00
Dirk Dougherty
6667c7976f
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:31:38 -07:00
Dirk Dougherty
e69271769a
am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
...
Merge commit 'fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp
* commit 'fa499e46203dba2db2bb40f71e5af1650315c67c':
Doc change: fix adt download page, misc doc fixes.
2010-05-26 16:51:12 -07:00
Dirk Dougherty
60f35bb2fe
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
2010-05-26 16:49:46 -07:00
Irfan Sheriff
df360ef5dd
am 9ecca85f: Merge "Fix escaping of characters" into froyo
...
Merge commit '9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp
* commit '9ecca85f0613032590c6840cae48b54f3d626181':
Fix escaping of characters
2010-05-26 13:04:11 -07:00
Irfan Sheriff
d50f8399fa
Merge "Fix escaping of characters" into froyo
2010-05-26 13:02:06 -07:00
Yu Shan Emily Lau
605cb756f8
am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
...
Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp
* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
Added the runtime parameters for the mediarecorder stress test.
2010-05-25 17:42:29 -07:00
Yu Shan Emily Lau
d5fa4a9f4f
Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
2010-05-25 17:40:51 -07:00
Robert Greenwalt
1a5fe61ee1
am d1055a25: Make the NTP Cache max-age gservices-settable
...
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp
* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
Make the NTP Cache max-age gservices-settable
2010-05-25 16:13:22 -07:00
Adam Powell
213f391635
am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
...
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:23:53 -07:00
Dirk Dougherty
534663ed7b
am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
...
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp
* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
Doc change: Fix incorrect adt version reference etc.
2010-05-24 09:56:47 -07:00
Andreas Huber
22f6934983
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
5fed07aa18
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
639f95ed10
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
Dirk Dougherty
1a4edf5b0d
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
Scott Main
6beef8e2d8
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
98ca2ec913
Merge "docs: add youtube video to highlights" into froyo
2010-05-19 20:24:18 -07:00
Scott Main
540070ae0d
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
ee85a0abcb
Merge "doc: add developing and testing info to backup guide" into froyo
2010-05-19 19:29:19 -07:00
Dirk Dougherty
66578db683
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
Scott Main
43fd902154
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
a40e97e159
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
0c113f694c
Merge "docs: revise platform intro" into froyo
2010-05-19 12:05:52 -07:00
The Android Open Source Project
7f3af556d7
merge from open-source master
...
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
2010-05-19 09:36:55 -07:00
The Android Open Source Project
5a14150771
merge from open-source master
...
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
2010-05-19 09:32:44 -07:00
The Android Open Source Project
5b417743a5
merge from open-source master
...
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
2010-05-19 09:20:22 -07:00
Romain Guy
f3998f6abc
Merge "Don't allow invalid Uris to be added as observers."
2010-05-19 09:03:57 -07:00
The Android Open Source Project
f6dce582f6
merge from open-source master
...
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
2010-05-19 08:39:13 -07:00
Jean-Baptiste Queru
ed02950ce1
Merge "Fix isssue 2548710: Native AudioTrack resources never freed."
2010-05-19 08:35:21 -07:00
The Android Open Source Project
ba7eb7398b
merge from open-source master
...
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
The Android Open Source Project
1c03f554f1
merge from open-source master
...
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
2010-05-19 08:15:54 -07:00
Romain Guy
39ced7d0b7
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
2010-05-19 00:03:34 -07:00
Romain Guy
a49307b993
Merge "Text disappears when selecting text in text editor."
2010-05-19 00:01:55 -07:00
Romain Guy
d93fe7c0ea
Merge "Removed Calls to deprecated APIs"
2010-05-19 00:01:02 -07:00
Romain Guy
bcb72f9af7
Merge "Improved error handling when font loading fails."
2010-05-18 23:51:16 -07:00
Suchi Amalapurapu
aa2c917926
am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
...
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
2010-05-18 14:53:37 -07:00
Suchi Amalapurapu
4f7c9354c5
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ce8ccb1e20
am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
c6c11bdbe0
Merge "Removing STOPSHIP logs." into froyo
2010-05-18 14:48:05 -07:00
Eric Laurent
558eec8011
Fix isssue 2548710: Native AudioTrack resources never freed.
...
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
2010-05-18 14:18:57 -07:00