The Android Open Source Project
fc7eccf5fd
am 55bef14f: am fb234bbe: merge from open-source master
2010-05-12 12:15:35 -07:00
The Android Open Source Project
e4582835f0
am fb234bbe: merge from open-source master
...
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken
* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
Notify user regarding invalid number during MO call.
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
Fix glReadPixels() to verify that both x and y are non-negative.
2010-05-12 12:13:18 -07:00
The Android Open Source Project
c77a20a9d6
merge from open-source master
...
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
2010-05-12 11:58:14 -07:00
Dirk Dougherty
0056e5eff5
am e46defea: am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:12:15 -07:00
Dirk Dougherty
8d5b2c4f2f
am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken
* commit '68b37d14708414d3cee418024c178f0a3c7d8b5b':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:10:10 -07:00
Dirk Dougherty
cd406480fa
am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp
* commit 'a04202b3258845688bcd8c6208222235569df733':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:08:46 -07:00
Dirk Dougherty
5d8d9f1ff1
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:05:03 -07:00
Jean-Michel Trivi
d9ab4e0cef
am afbc5fad: Fix build Remove from API 9 definition the two methods that were removed from API 8.
2010-05-12 10:53:50 -07:00
Scott Main
a338186970
am 1d9b25a0: am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo
2010-05-12 08:50:21 -07:00
Dirk Dougherty
bc759a01c7
am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
2010-05-12 08:50:16 -07:00
Dirk Dougherty
8adfe2d295
am a1cdf279: am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
2010-05-12 08:50:12 -07:00
Scott Main
31806cefd6
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
f14282e25b
am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
2010-05-12 08:49:57 -07:00
Scott Main
f8a36aa6de
am 9809015b: am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
2010-05-12 08:49:53 -07:00
Scott Main
59dd4b7d40
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
2042adc37d
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
528596388c
am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
2010-05-12 08:49:37 -07:00
Marco Nelissen
2d0b5494e0
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
870e7fb321
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
a611ec7fd1
am 856f0bad: am 84a30dbf: am 5cdf5fdc: docs: add document about app install location
2010-05-12 08:49:17 -07:00
Dirk Dougherty
595586331b
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
07391c450d
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
fc1eeab8d0
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
28e0941d2a
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
efcebef912
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
d1897c74d7
am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 08:48:20 -07:00
Jean-Michel Trivi
ed51742618
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
7bd44d6bde
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
ee791dc075
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
1217a40632
am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.
2010-05-12 08:47:42 -07:00
Scott Main
6759221873
am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo
...
Merge commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9' into kraken
* commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9':
docs: fix broken anchor names
2010-05-12 07:57:13 -07:00
Dirk Dougherty
38adab61df
am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
...
Merge commit '052e2102df8e45af2797faff7aefda26aeb345d7' into kraken
* commit '052e2102df8e45af2797faff7aefda26aeb345d7':
Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
2010-05-12 07:57:10 -07:00
Dirk Dougherty
b5064933d8
am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
...
Merge commit '89f74cf66c635c8835d6fc4057c6901037f704dd' into kraken
* commit '89f74cf66c635c8835d6fc4057c6901037f704dd':
Doc change: update diff report 7-> 8
2010-05-12 07:57:06 -07:00
Scott Main
68754870e4
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
491066ddd5
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
52f50ef3d1
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
920edfca5f
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
7aab2e4f19
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
964e3ef00d
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
9cafcad31d
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
d643705c06
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
83029bcb7a
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
87e85c633f
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
745ae50509
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
a2740229c8
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
9a77d1f27a
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
21eb0390d1
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
7d3262c5ba
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
Jean-Michel Trivi
9496e90287
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
c36408479d
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
