The Android Automerger
b3ca85e5f7
Merge branch 'froyo' into froyo-release
2010-05-14 12:12:14 -07:00
Dirk Dougherty
32374efa5f
Merge "Doc change: adjustments for ndk feature description" into froyo
2010-05-13 21:31:10 -07:00
Suchi Amalapurapu
60ef6d786f
Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
2010-05-13 16:02:20 -07:00
The Android Automerger
2fddf1537c
Merge branch 'froyo' into froyo-release
2010-05-12 19:53:24 -07:00
Costin Manolache
c7e64a8e4b
Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:04:27 -07:00
Costin Manolache
b4490ffd58
Bug 2680071: Rename the Cloud to Device
...
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
2010-05-12 16:16:34 -07:00
Scott Main
7a789c8b1a
Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:01:31 -07:00
Scott Main
003f8c3ea6
Merge "docs: fix broken links" into froyo
2010-05-12 14:53:35 -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
Scott Main
5f50306d26
Merge "docs: fix broken anchor names" into froyo
2010-05-11 20:13:26 -07:00
Dirk Dougherty
c42a5b0d6e
Merge "Doc change: update diff report 7-> 8" into froyo
2010-05-11 19:53:04 -07:00
Scott Main
2a2c699ffa
Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
2010-05-11 19:25:19 -07:00
Brett Chabot
b7c34d1610
Merge "Fix imf tests." into froyo
2010-05-11 19:17:04 -07:00
The Android Automerger
9fc1c24d73
Merge branch 'froyo' into froyo-release
2010-05-11 16:40:17 -07:00
Scott Main
6ff074cb78
Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-11 15:25:38 -07:00
Xavier Ducrohet
4ef3c6a791
Merge "Hide two audio focus methods." into froyo
2010-05-11 14:48:48 -07:00
Marco Nelissen
ac1feedad2
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-11 14:36:16 -07:00
Dianne Hackborn
cd4d3b6287
Merge "Fix issue #2676378 : Activity Manager Crash on FRF40" into froyo
2010-05-11 14:26:43 -07:00
Dirk Dougherty
0feef91d2b
Merge "Doc Change: Docs for NDK r4." into froyo
2010-05-11 14:20:24 -07:00
Scott Main
2577b83dfe
Merge "docs: announce froyo and update IO message" into froyo
2010-05-11 14:04:49 -07:00
Mike Lockwood
c9797fed88
Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
2010-05-11 13:26:25 -07:00
Andreas Huber
c5417a7da5
Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
2010-05-11 12:21:14 -07:00
Andreas Huber
1722e37f40
Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
2010-05-11 12:20:55 -07:00
Costin Manolache
8e254d83ec
Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-11 11:42:58 -07:00
Jean-Michel Trivi
edd2838a25
Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-11 11:40:21 -07:00
Dirk Dougherty
6f29001ba5
Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
2010-05-11 11:33:13 -07:00
Jean-Michel Trivi
d657af3915
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 completion listener to not be called, which with the AudioFocus logic causes the Music app to pause and never resume. The NotificationPlayer modifications cause the MediaPlayer for the notification to only request audio focus when the data source is not empty. The audio focus code in AudioService is defensively synchronized against a unique lock, and the exception observed in bug 2670395 is explicitely caught in case another edge case wasn't caught by this fix. The AudioFocus handling in AudioManager is modified so only the requestAudioFocus and abandonAudioFocus methods are meant to be used, as registerAudioFocusListener and unregisterAudioFocusListener provided no additional functionality over the request/abandon methods. abandonAudioFocus() also removes the listener from the map in AudioManager since after abandonning focus, the listener would no longer be called." into froyo
2010-05-11 09:42:41 -07:00
Keith Ito
735da3103b
Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-10 20:41:47 -07:00
Costin Manolache
7395cf239b
Bug 2673557: rename datamessaging
...
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
2010-05-10 19:12:49 -07:00
The Android Automerger
4d8ce07141
Merge branch 'froyo' into froyo-release
2010-05-10 18:12:00 -07:00
Dianne Hackborn
ff91f88305
Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-10 17:27:14 -07:00
Dirk Dougherty
d48af30682
Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-10 16:23:13 -07:00
Jim Miller
dbcc5242bc
Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-10 15:55:41 -07:00
Robert Greenwalt
49503107e9
Merge "String change to refer to wifi tether as hotspot" into froyo
2010-05-10 10:11:12 -07:00
Scott Main
3bd882a0e2
Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
2010-05-10 09:54:30 -07:00
Dan Egnor
cd836255bf
Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
2010-05-09 07:03:46 -07:00
Dirk Dougherty
2f2c2bb2fe
Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
2010-05-07 21:07:57 -07:00
Andreas Huber
a10b8ac9f8
Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
2010-05-07 13:47:42 -07:00
Mathias Agopian
026fba3698
Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
2010-05-07 13:39:29 -07:00
The Android Automerger
c653157c1d
Merge branch 'froyo' into froyo-release
2010-05-07 10:57:56 -07:00
Dirk Dougherty
37c990e9e2
Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
2010-05-07 10:57:48 -07:00
Bjorn Bringert
cea4d290c0
Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
2010-05-07 03:37:48 -07:00
Mathias Agopian
179169e88e
fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
...
the window manger puts SurfaceViews up before they have been
rendered into, because of that surfaceflinger doesn't have
anything ready to draw for that surface when an udpate occurs
and responds by filling the surface with black.
With this fix, we only fill those areas of the framebuffer
that would otherwise be undefined (no content at all).
in the Flash case, the "flash" window is not drawn at all
until it has some content, instead the underlaying browser
window is shown.
Change-Id: Ifb610f7f8c27b88edf83e09adc4803fc295c15a1
2010-05-06 20:21:45 -07:00
The Android Automerger
8db1c5610f
Merge branch 'froyo' into froyo-release
2010-05-06 17:55:07 -07:00
Dan Egnor
359b3fd8d8
Merge "Make static versions of libutils and libbinder." into froyo
2010-05-06 17:31:48 -07:00
Daniel Sandler
e854180f4f
Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
2010-05-06 17:23:03 -07:00
Robert Greenwalt
3bc8dc86a1
Merge "Fix ThrottleService wifi interaction" into froyo
2010-05-06 17:14:23 -07:00
Xia Wang
a62ab7c22a
Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
2010-05-06 15:24:08 -07:00
Dan Morrill
2e55d964ca
Merge "Adding PacketVideo attribution in NOTICE." into froyo
2010-05-06 15:11:02 -07:00
Dan Morrill
869aba8aaf
Adding PacketVideo attribution in NOTICE.
...
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
2010-05-06 14:15:47 -07:00
