21271 Commits

Author SHA1 Message Date
Dianne Hackborn
6f86c0e64b Fix issue #2676378: Activity Manager Crash on FRF40
D'oh!

Change-Id: If1b43ff5f230f9bf0de0887deb1b25dcf6aa6e66
2010-05-11 14:20:52 -07:00
Dirk Dougherty
8acb68e9aa Merge "Doc Change: Docs for NDK r4." into froyo 2010-05-11 14:20:24 -07:00
Scott Main
c80b95a85a Merge "docs: announce froyo and update IO message" into froyo 2010-05-11 14:04:49 -07:00
Dirk Dougherty
d6a04186b6 Doc Change: Docs for NDK r4.
Change-Id: Ib535324eb884d4be2c7bbba2d74cc9043acc3475
2010-05-11 13:29:58 -07:00
Mike Lockwood
e1d7dca608 Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 2010-05-11 13:26:25 -07:00
Marco Nelissen
33f49c8377 Don't clear the _data column in the audio_meta table, since it isn't
needed, and causes a sqlite constraint exception.
Bug 2671792.

Change-Id: Ie6e5d0369c3750739fa155e651be4d87c016a41f
2010-05-11 13:09:06 -07:00
Mike Lockwood
f19a785e15 LocationManagerService: Call updateNetworkState on providers that are disabled.
Fixes a problem with Network Location not working after SetupWizard until the
network state changes.

Change-Id: Ief81b76beb5cc90b2ca7d8aa2d4c99221898f01d
BUG: 2671347

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-11 15:35:09 -04:00
Andreas Huber
e0dc80f878 Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo 2010-05-11 12:21:14 -07:00
Andreas Huber
d6ad7c85fa 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
e2055fe425 Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-11 11:42:58 -07:00
Jean-Michel Trivi
3e90c76c12 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
fe08933450 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
Joe Malin
5e17347a27 Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
Change-Id: I0da7ebb8040013611ba9269bc303e4b8197033aa
2010-05-11 11:25:23 -07:00
Jean-Michel Trivi
46b3a1808a Update javadoc in android.media.AudioManager to not hide the
registerAudioFocusListener() methods.

Change-Id: I8df37bd89df6f492aeb70fa636200552140578f9
2010-05-11 11:22:54 -07:00
Andreas Huber
e67c1607cc Support for customizable socket-read timeouts through the HTTP response.
Specify a response header of "X-SocketTimeout: 15" to override the default timeout
of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the
timeout altogether.

Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db
related-to-bug: 2675721
2010-05-11 11:10:21 -07:00
Scott Main
0d3401d81b docs: announce froyo and update IO message
Change-Id: I07a071c99eaf0a03e7dd9d4e0c5969b47e86ab08
2010-05-11 10:49:59 -07:00
Andreas Huber
34c70709a6 Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
Change-Id: I3c76d35da48e0964f7a0fa2816f8573b5e1a9436
related-to-bug: 2674036
QA-impact: low, only affects ogg-vorbis playback through http
2010-05-11 10:11:55 -07:00
Jean-Michel Trivi
aaa01b181c 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
Jean-Michel Trivi
392a2bbb52 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.

Change-Id: I3b553ee8a8163c25e01117d7e5479dd5fdfa7c6b
2010-05-11 09:20:49 -07:00
Wu-cheng Li
78624e41da Add remove method in CameraParameters class.
bug:2672651
Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
2010-05-11 12:54:14 +08:00
Keith Ito
be65399baf Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 2010-05-10 20:41:47 -07:00
Nicolas Roard
f78acacb0d Fix the 'wobbling fixed elements' bug.
Cherry-picked from master.
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)

Bug:2665696
Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7
2010-05-10 19:31:54 -07:00
Costin Manolache
161c75a0f3 Bug 2673557: rename datamessaging
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
2010-05-10 19:12:49 -07:00
Keith Ito
9114a8bb8b Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
Change-Id: I10b02306478d9c595dbcae0767b44c403d50e24a
2010-05-10 18:27:23 -07:00
Dianne Hackborn
6d00151c51 Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-10 17:27:14 -07:00
Dianne Hackborn
906497c574 Hopefully fix issue #2662536: Why is launcher being killed?
It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all.  This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at.  I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.

In addition, this change cleans up and reduces some of the logging
around killing processes.

Finally, try to improve process LRU management a bit by taking
into account process dependencies.  Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving.  Also, we bring a process up if someone accesses its content
provider.

Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
2010-05-10 17:19:58 -07:00
Dirk Dougherty
1926c471a3 Merge "Doc change: Final api diffs 7 -> 8." into froyo 2010-05-10 16:23:13 -07:00
Dirk Dougherty
b32c2402c2 Doc change: add toc references to tictactoe sample apps and screen shots.
Change-Id: I7d520587c0e6b2252e819029a2f053893fdcd7c3
2010-05-10 16:19:52 -07:00
Jim Miller
a27579016c Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-10 15:55:41 -07:00
Jim Miller
7d38886ba6 Fix 2660488: Add LockScreen/InCallScreen resources to preloads
This adds the base SlidinTab drawable resources shared by
InCallScreen and LockScreen into the zygote process. It should
save approximately 375kB (mdpi) and 825kB (hdpi) of RAM by
sharing resource between the LockScreen and InCallScreen.

Change-Id: I05bcafa894ed27d419b171ad5041bd83134461f7
2010-05-10 15:24:47 -07:00
Scott Main
03bf5c7a73 docs: remove allowBackup attribute from documentation
Change-Id: I377c354af77c6b915d35c7e374bae03020063856
2010-05-10 11:08:26 -07:00
Robert Greenwalt
b74a239fd2 Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:11:12 -07:00
Scott Main
62c28caee4 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
7d16737668 Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 2010-05-09 07:03:46 -07:00
Robert Greenwalt
ebdbc7ec11 String change to refer to wifi tether as hotspot
bug:2664412
Change-Id: I9ab110f88551d03a9215b81887675c50aa575d9a
2010-05-08 15:07:53 -07:00
Dirk Dougherty
fb70ffd993 Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 2010-05-07 21:07:57 -07:00
Joe Malin
902054336e Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Change-Id: Ie94632bc7becb3b388d1ecb01512ce29efc04208
2010-05-07 21:04:31 -07:00
Dirk Dougherty
37627b9fd1 Doc change: Final api diffs 7 -> 8.
Change-Id: Ie4b13f6b85439009f8236f8c082ca28021aa9b0c
2010-05-07 17:11:18 -07:00
Scott Main
c4c42eef9a docs: add default value and compatibility info for installLocation
Change-Id: I2336bc0c7edb68a0c452e44633a8163a2798d7de
2010-05-07 15:30:15 -07:00
Scott Main
c6cb8a78d0 docs: revisions to the new resources doc based on editorial feedback
plus some fixes to resource references and other misc revisions

Change-Id: I7b498858d9d0ecfd8cf9bad48c08c93047d597b8
2010-05-07 15:18:49 -07:00
Scott Main
bf1d0b900e docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
Change-Id: Ic240502b8874fdc69d1d97cbf9df0ef925fbc071
2010-05-07 15:08:36 -07:00
Andreas Huber
d13efb2008 Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 2010-05-07 13:47:42 -07:00
Mathias Agopian
c69775d616 Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 2010-05-07 13:39:29 -07:00
Andreas Huber
388379f8b4 A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95
related-to-bug: 2654400
2010-05-07 12:01:45 -07:00
Dirk Dougherty
0dd3a23951 Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 2010-05-07 10:57:48 -07:00
Brian Carlstrom
e616553ebc Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Part of fixing b/2663512: "java.io.IOException: SSL shutdown failed.: Ok" shouldn't dump a stacktrace

Change-Id: Ic6070ab9abb58c08eb7c5d8648424f582bb48e1c
2010-05-07 10:13:36 -07:00
Joe Malin
18457d0c21 Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Change-Id: If43ba08af00c8c9fcf6d05834f8b2a7a719b4bec
2010-05-07 10:06:53 -07:00
Dan Egnor
43fe81bc2c Add unit test for passing thread priority & cgroup through Binder.
This test actually exposes some bugs -- the test passes as written, but
certain parts are commented out with references to the bugs in question.

Bug: 2665914
Bug: 2665954
Change-Id: I61220e0efadc4edbb6ad419d26fa1f0f50bbc24c
2010-05-07 09:32:54 -07:00
Joe Malin
e50b940f15 Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Change-Id: Id2525470127a6324c361d952f09afec7dd584704
2010-05-07 08:37:23 -07:00
Bjorn Bringert
75370e7462 Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:37:48 -07:00