Mike LeBeau
fc8d8fafaf
am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentNam
...
Merge commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp
* commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7':
Use flattenToShortString instead of toShortString on ComponentNames to
2010-04-01 18:14:30 -07:00
Mike LeBeau
6a569b5230
Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo
2010-04-01 18:11:43 -07:00
Charles Chen
44fd0cdaa8
am ddc2eb8e: Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo
...
Merge commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp
* commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
Fix for bug 2564771 - pitch setting between apps can
2010-04-01 17:59:57 -07:00
Charles Chen
71cc165645
Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo
2010-04-01 17:56:47 -07:00
Yu Shan Emily Lau
8d38784f10
am e11bafec: Add the test template for the media audio manager test.
...
Merge commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48' into froyo-plus-aosp
* commit 'e11bafec8d6c887c6ae95fa3d39c202859e86d48':
Add the test template for the media audio manager test.
2010-04-01 17:43:27 -07:00
Mike LeBeau
c8be3a46af
am e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173 " into froyo
...
Merge commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp
* commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
2010-04-01 17:42:38 -07:00
Mike LeBeau
4f44eece60
Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173 " into froyo
2010-04-01 15:30:51 -07:00
Gilles Debunne
59038a5547
am 83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo
...
Merge commit '83d4eb6c4fc35bd8ce203edde0051d4def8c2cef' into froyo-plus-aosp
* commit '83d4eb6c4fc35bd8ce203edde0051d4def8c2cef':
Refactor in PositionTesterContextMenuListener.
2010-04-01 14:49:51 -07:00
Gilles Debunne
71475036eb
Merge "Refactor in PositionTesterContextMenuListener." into froyo
2010-04-01 14:47:00 -07:00
Brett Chabot
46efee07d2
am f6118617: Merge "Remove FrameworkTest package." into froyo
...
Merge commit 'f6118617350c0c1541550bf3a558460db562b6a4' into froyo-plus-aosp
* commit 'f6118617350c0c1541550bf3a558460db562b6a4':
Remove FrameworkTest package.
2010-04-01 14:40:43 -07:00
Brett Chabot
6d5e502c08
Merge "Remove FrameworkTest package." into froyo
2010-04-01 14:36:36 -07:00
Fred Quintana
c5c4135a08
am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo
...
Merge commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a' into froyo-plus-aosp
* commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a':
allow null authtokens to invalidateAuthToken
2010-04-01 14:32:51 -07:00
Fred Quintana
43974e6e4e
Merge "allow null authtokens to invalidateAuthToken" into froyo
2010-04-01 14:27:00 -07:00
Derek Sollenberger
97bf7bfe16
am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive.
...
Merge commit '11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp
* commit '11fb6144604fbd1148695421e9ab6896701a431b':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
2010-04-01 12:06:25 -07:00
Dirk Dougherty
6025796ec2
am 2d8234b7: Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
...
Merge commit '2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp
* commit '2d8234b73d11fdc2178232cabad3ffaa23723405':
doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
2010-04-01 10:40:15 -07:00
James Dong
5627f6093a
am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
...
Merge commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp
* commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
Public API changes for CameraProfile and CamcorderProfile classes
2010-04-01 10:40:11 -07:00
Dirk Dougherty
805fc9d373
Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
2010-04-01 10:35:21 -07:00
James Dong
5bc3f94b99
Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
2010-04-01 10:33:45 -07:00
Robert Greenwalt
87f083fc8d
am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
...
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp
* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
NetworkManagementService: Add interface counters & throttle API
2010-04-01 10:22:51 -07:00
Robert Greenwalt
e146999bc8
Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
2010-04-01 10:19:57 -07:00
Kristian Monsen
08326ed4e4
am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo
...
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp
* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
Fix for bug 2558156: Encodig is null
2010-04-01 09:57:12 -07:00
Kristian Monsen
97ad6b7683
Merge "Fix for bug 2558156: Encodig is null" into froyo
2010-04-01 09:54:47 -07:00
Dave Sparks
ca08c653bb
am 49e5a4c5: Update AMR codec.
...
Merge commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26' into froyo-plus-aosp
* commit '49e5a4c5be2e8ba114efff8d0634a34867cb2c26':
Update AMR codec.
2010-04-01 09:47:58 -07:00
Ben Murdoch
9859ba197a
am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
...
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp
* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
Cherry pick from master.
Cherry pick from master.
2010-04-01 08:44:58 -07:00
Ben Murdoch
057779af45
Merge changes Ic9531e3c,I3f04433b into froyo
...
* changes:
Cherry pick from master.
Cherry pick from master.
2010-04-01 08:42:14 -07:00
Grace Kloba
9129fe7980
am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
...
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp
* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
As we don't support over scroll any more, we need
2010-04-01 08:17:35 -07:00
Grace Kloba
b346d80e8c
Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
2010-04-01 08:15:09 -07:00
Eric Laurent
c3f48fd34b
am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo
...
Merge commit '3fe1708d9d204fa63e8abe6e434378d89e963752' into froyo-plus-aosp
* commit '3fe1708d9d204fa63e8abe6e434378d89e963752':
Fix isssue 2548710: Native AudioTrack resources never freed.
2010-03-31 23:37:02 -07:00
Eric Laurent
09806e4578
Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-03-31 23:33:52 -07:00
Dianne Hackborn
22de8e037c
am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
...
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp
* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
2010-03-31 23:18:32 -07:00
Dianne Hackborn
836e97da75
am 513ae361: Merge "Fix issue #2560791 : Expose API to go in to car mode." into froyo
...
Merge commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp
* commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
Fix issue #2560791 : Expose API to go in to car mode.
2010-03-31 23:18:28 -07:00
Dianne Hackborn
ea8e1512e3
am 686f7911: Merge "Fix issue #2561067 : Screen Display half faded..." into froyo
...
Merge commit '686f7911a3462d6847d2a9396572eaaf04a9f175' into froyo-plus-aosp
* commit '686f7911a3462d6847d2a9396572eaaf04a9f175':
Fix issue #2561067 : Screen Display half faded...
2010-03-31 23:18:24 -07:00
Xia Wang
62faa6bcb5
am de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
...
Merge commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9' into froyo-plus-aosp
* commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9':
Test connecitvity manager functionality in state change.
2010-03-31 23:18:21 -07:00
Adam Powell
4b311de50d
am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo
...
Merge commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705' into froyo-plus-aosp
* commit '40cd1cf6aab4e9ef773cd3f6b8c8107da30bd705':
Fix bug 2562240 and clean up scrollbar behavior
2010-03-31 23:18:17 -07:00
Suchi Amalapurapu
73b5f73bae
am ae18171a: Change certificate policy.
...
Merge commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad' into froyo-plus-aosp
* commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad':
Change certificate policy.
2010-03-31 23:18:12 -07:00
Jaikumar Ganesh
6a591a524b
am 3a0d1d11: Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
...
Merge commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6' into froyo-plus-aosp
* commit '3a0d1d11eba05d74d0461083eb6f31321588a0f6':
Fix crash while turning bluetooth on, due to a race condition.
2010-03-31 23:18:05 -07:00
Dianne Hackborn
ca85c03c8f
Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
2010-03-31 23:04:22 -07:00
Dianne Hackborn
678a358930
Merge "Fix issue #2560791 : Expose API to go in to car mode." into froyo
2010-03-31 23:03:26 -07:00
Dianne Hackborn
e651e76ee4
Merge "Fix issue #2561067 : Screen Display half faded..." into froyo
2010-03-31 22:49:30 -07:00
Xia Wang
55ae1b22e6
Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
2010-03-31 20:29:10 -07:00
Adam Powell
aec2819346
Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo
2010-03-31 20:11:33 -07:00
Jaikumar Ganesh
dc03e510fe
Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
2010-03-31 18:36:35 -07:00
Dirk Dougherty
03706c6220
am 058e385b: doc change: fix link in guidelines index.
...
Merge commit '058e385b8bca0376c27a24a54f3b00777ef30e0a' into froyo-plus-aosp
* commit '058e385b8bca0376c27a24a54f3b00777ef30e0a':
doc change: fix link in guidelines index.
2010-03-31 16:17:36 -07:00
Jeff Brown
d98e68ef4a
am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
...
Merge commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc' into froyo-plus-aosp
* commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc':
Fix alarms with negative or very large wakup times.
2010-03-31 16:00:58 -07:00
Jeff Brown
48bec69042
Merge "Fix alarms with negative or very large wakup times." into froyo
2010-03-31 15:56:30 -07:00
Dirk Dougherty
001da71727
am 36b3b5fc: doc change: several fixes for UI Guidelines doc.
...
Merge commit '36b3b5fc9a86a77488ed8b2497621ddca03d3cba' into froyo-plus-aosp
* commit '36b3b5fc9a86a77488ed8b2497621ddca03d3cba':
doc change: several fixes for UI Guidelines doc.
2010-03-31 14:58:48 -07:00
Dirk Dougherty
ebec5d195f
am 59e644e3: doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
...
Merge commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4' into froyo-plus-aosp
* commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4':
doc change: cherry pick c87f7a658ea586a5271fabc6e0516a2ddf6f from master
2010-03-31 14:45:50 -07:00
The Android Open Source Project
45ef27a260
merge from open-source master
...
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
2010-03-31 14:01:45 -07:00
Jean-Michel Trivi
ff46e2eed3
am 3ce1648f: Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
...
Merge commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1' into froyo-plus-aosp
* commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1':
Fix bug 2553575 API REVIEW: android.media Change 1 of 3
2010-03-31 13:44:20 -07:00
Jean-Michel Trivi
e4cdfce1be
Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
2010-03-31 13:40:42 -07:00