Brett Chabot
3d638b4100
am 342e520b: am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
2010-05-12 09:25:51 -07:00
Scott Main
4cfa261199
am 05d4198c: am 9809015b: am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
2010-05-12 09:25:46 -07:00
Scott Main
8e3e1697d1
am 604821f8: am 5b46aa36: am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles
2010-05-12 09:25:41 -07:00
Scott Main
5f48b0b1be
am 7d653029: am 1dc7c4ab: am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-12 09:25:36 -07:00
Xavier Ducrohet
c5c16f5f60
am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
2010-05-12 09:25:25 -07:00
Marco Nelissen
725d2c7e6d
am 11291901: 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 09:25:19 -07:00
Dianne Hackborn
fafb3993ea
am 5f1ebb9f: am bf00233b: am b6e1ec19: am 037cd341: Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
2010-05-12 09:25:13 -07:00
Scott Main
11d1e663ae
am 1085d95a: am 856f0bad: am 84a30dbf: am 5cdf5fdc: docs: add document about app install location
2010-05-12 09:25:07 -07:00
Dirk Dougherty
524fbe0911
am 4f92d6a3: am a38f5e70: am 712f6408: am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
2010-05-12 09:24:59 -07:00
Scott Main
68301d03f3
am e695b670: am 5cb0d501: am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
2010-05-12 09:24:51 -07:00
Mike Lockwood
105384e360
am 4d0c3083: am c7c856fb: am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
2010-05-12 09:24:43 -07:00
Andreas Huber
d974b80fe1
am 1d0e5599: am 11777d6f: am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
2010-05-12 09:24:35 -07:00
Andreas Huber
e21aa3b154
am 286a6355: 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 09:24:28 -07:00
Costin Manolache
3a17fbb757
am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 09:24:20 -07:00
Jean-Michel Trivi
1e438357f0
am 4f9c9aa8: am fd5a747f: am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-12 09:24:12 -07:00
android-build SharedAccount
fb1097b3a6
resolved conflicts with ae4043ce1db1e2b30c23ec3d5b22fd382b92d961 merge
...
Change-Id: I6618d37c717f592c9f016367395c2bce36215638
2010-05-12 09:21:52 -07:00
Jean-Michel Trivi
9f7c4112ac
am 11e26c28: 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 not
2010-05-12 09:14:19 -07:00
Wu-cheng Li
f355b34014
am 9813a3a2: am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.
2010-05-12 09:14:11 -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
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: rename datamessaging
2010-05-12 07:55:32 -07:00
