Scott Main
7331e8062c
am 812266dd: am a250e328: am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
2010-05-12 08:50:08 -07:00
Brett Chabot
342e520b78
am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
2010-05-12 08:49:57 -07:00
Scott Main
05d4198cb6
am 9809015b: am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
2010-05-12 08:49:53 -07:00
Scott Main
604821f846
am 5b46aa36: am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles
2010-05-12 08:49:48 -07:00
Scott Main
7d653029e5
am 1dc7c4ab: am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-12 08:49:42 -07:00
Xavier Ducrohet
6914e17a86
am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
2010-05-12 08:49:37 -07:00
Marco Nelissen
11291901df
am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
2010-05-12 08:49:29 -07:00
Dianne Hackborn
5f1ebb9f18
am bf00233b: am b6e1ec19: am 037cd341: Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
2010-05-12 08:49:23 -07:00
Scott Main
1085d95afd
am 856f0bad: am 84a30dbf: am 5cdf5fdc: docs: add document about app install location
2010-05-12 08:49:17 -07:00
Dirk Dougherty
4f92d6a3c9
am a38f5e70: am 712f6408: am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
2010-05-12 08:49:00 -07:00
Scott Main
e695b6706f
am 5cb0d501: am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
2010-05-12 08:48:54 -07:00
Mike Lockwood
4d0c30834b
am c7c856fb: am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
2010-05-12 08:48:42 -07:00
Andreas Huber
1d0e5599e2
am 11777d6f: am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
2010-05-12 08:48:35 -07:00
Andreas Huber
286a635537
am b076e6f3: am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
2010-05-12 08:48:28 -07:00
Costin Manolache
b20842c75f
am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 08:48:20 -07:00
Jean-Michel Trivi
4f9c9aa8e0
am fd5a747f: am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-12 08:48:07 -07:00
Dirk Dougherty
ae4043ce1d
am 17246c6d: am 6d405cfc: am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
2010-05-12 08:47:59 -07:00
Jean-Michel Trivi
11e26c2895
am 9f35d39a: am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications ca
2010-05-12 08:47:51 -07:00
Wu-cheng Li
9813a3a250
am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.
2010-05-12 08:47:42 -07:00
Scott Main
812266dda4
am a250e328: am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
...
Merge commit 'a250e3287dea625930b1591b7139decc304bf76b' into kraken
* commit 'a250e3287dea625930b1591b7139decc304bf76b':
docs: remove the dashboard from the sidenav for the offline docs
2010-05-12 07:57:02 -07:00
Brett Chabot
4924ea490f
am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
...
Merge commit 'c8e84e12beb876f904d0090fe021beae73722786' into kraken
* commit 'c8e84e12beb876f904d0090fe021beae73722786':
Fix imf tests.
2010-05-12 07:56:54 -07:00
Scott Main
9809015b48
am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
...
Merge commit '21f18e9633967e69ebe7a172b902420fec485bba' into kraken
* commit '21f18e9633967e69ebe7a172b902420fec485bba':
docs: make Notifying the User an expandable list
2010-05-12 07:56:49 -07:00
Scott Main
5b46aa36b6
am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles
...
Merge commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5' into kraken
* commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5':
docs: add quickview box with "see also" links for some articles
2010-05-12 07:56:45 -07:00
Scott Main
1dc7c4ab66
am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
...
Merge commit '0130e3837638b998ff28786618bc6a7fc6417711' into kraken
* commit '0130e3837638b998ff28786618bc6a7fc6417711':
docs: remove allowBackup attribute from documentation
2010-05-12 07:56:40 -07:00
Xavier Ducrohet
08eff49f09
am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
...
Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken
* commit 'd9712b69ce529fbf50b3b837032c1dc40e623381':
Hide two audio focus methods.
2010-05-12 07:56:29 -07:00
Marco Nelissen
550884e2f3
am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
...
Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken
* commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b':
Don't clear the _data column in the audio_meta table, since it isn't
2010-05-12 07:56:24 -07:00
Dianne Hackborn
bf00233b88
am b6e1ec19: am 037cd341: Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
...
Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken
* commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366':
Fix issue #2676378 : Activity Manager Crash on FRF40
2010-05-12 07:56:19 -07:00
Scott Main
856f0bad16
am 84a30dbf: am 5cdf5fdc: docs: add document about app install location
...
Merge commit '84a30dbff1d6e04fd7660983233ae5502b414b07' into kraken
* commit '84a30dbff1d6e04fd7660983233ae5502b414b07':
docs: add document about app install location
2010-05-12 07:56:13 -07:00
Dirk Dougherty
a38f5e705c
am 712f6408: am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
...
Merge commit '712f6408140af90477bccbc64f598c5e51833c7b' into kraken
* commit '712f6408140af90477bccbc64f598c5e51833c7b':
Doc Change: Docs for NDK r4.
2010-05-12 07:56:07 -07:00
Scott Main
5cb0d5015a
am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
...
Merge commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1' into kraken
* commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1':
docs: announce froyo and update IO message
2010-05-12 07:56:01 -07:00
Mike Lockwood
c7c856fb85
am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
...
Merge commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c' into kraken
* commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c':
LocationManagerService: Call updateNetworkState on providers that are disabled.
2010-05-12 07:55:55 -07:00
Andreas Huber
11777d6fa2
am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
...
Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken
* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
Support for customizable socket-read timeouts through the HTTP response.
2010-05-12 07:55:48 -07:00
Andreas Huber
b076e6f3e0
am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
...
Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken
* commit '227e443a43d70b9463b2e685688f73cfb1b72096':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
2010-05-12 07:55:40 -07:00
Costin Manolache
8579a4d726
am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken
* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
Bug 2673557
2010-05-12 07:55:32 -07:00
Jean-Michel Trivi
fd5a747fc8
am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
...
Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken
* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
Update javadoc in android.media.AudioManager to not hide the
2010-05-12 07:55:25 -07:00
Dirk Dougherty
17246c6d90
am 6d405cfc: am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
...
Merge commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3' into kraken
* commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3':
Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
2010-05-12 07:55:17 -07:00
Jean-Michel Trivi
9f35d39a05
am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the comp
...
Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken
* commit 'ea37d9b489aac1a4a8de71887581fe712e26e144':
Fix bug 2670395 and 2599698
2010-05-12 07:55:09 -07:00
Wu-cheng Li
b339013589
am d8c33747: am 78624e41: Add remove method in CameraParameters class.
...
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken
* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
Add remove method in CameraParameters class.
2010-05-12 07:55:00 -07:00
Scott Main
a250e3287d
am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
...
Merge commit '827a50dda4c1900ab5333f8c2d3705796ff4649d' into froyo-plus-aosp
* commit '827a50dda4c1900ab5333f8c2d3705796ff4649d':
docs: remove the dashboard from the sidenav for the offline docs
2010-05-12 07:50:48 -07:00
Brett Chabot
c8e84e12be
am b4c9a8f6: Merge "Fix imf tests." into froyo
...
Merge commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp
* commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
Fix imf tests.
2010-05-12 07:50:44 -07:00
Scott Main
21f18e9633
am bb129dc5: docs: make Notifying the User an expandable list
...
Merge commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp
* commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
docs: make Notifying the User an expandable list
2010-05-12 07:50:41 -07:00
Scott Main
d522b270a9
am a225e3b1: docs: add quickview box with "see also" links for some articles
...
Merge commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp
* commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085':
docs: add quickview box with "see also" links for some articles
2010-05-12 07:50:36 -07:00
Scott Main
0130e38376
am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
...
Merge commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa' into froyo-plus-aosp
* commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa':
docs: remove allowBackup attribute from documentation
2010-05-12 07:50:30 -07:00
Xavier Ducrohet
d9712b69ce
am b1235a57: Merge "Hide two audio focus methods." into froyo
...
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp
* commit 'b1235a57a09174179553acecef2370354bdcbf41':
Hide two audio focus methods.
2010-05-12 07:50:19 -07:00
Marco Nelissen
bbafdc6403
am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
...
Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp
* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
Don't clear the _data column in the audio_meta table, since it isn't
2010-05-12 07:50:14 -07:00
Dianne Hackborn
b6e1ec19dd
am 037cd341: Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
...
Merge commit '037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp
* commit '037cd3413a925c6f449050096a7cd4aab3207612':
Fix issue #2676378 : Activity Manager Crash on FRF40
2010-05-12 07:50:09 -07:00
Scott Main
84a30dbff1
am 5cdf5fdc: docs: add document about app install location
...
Merge commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp
* commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
docs: add document about app install location
2010-05-12 07:50:02 -07:00
Dirk Dougherty
712f640814
am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
...
Merge commit '8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp
* commit '8acb68e9aae7f6766b88440ede6598da63db9fdd':
Doc Change: Docs for NDK r4.
2010-05-12 07:49:57 -07:00
Scott Main
9c68959240
am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
...
Merge commit 'c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp
* commit 'c80b95a85ae31eba80870cb3416fd2c25821c056':
docs: announce froyo and update IO message
2010-05-12 07:49:51 -07:00
Mike Lockwood
d2084bb689
am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
...
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp
* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
LocationManagerService: Call updateNetworkState on providers that are disabled.
2010-05-12 07:49:45 -07:00
