2461 Commits

Author SHA1 Message Date
Mike Lockwood
d2084bb689 am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp

* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
  LocationManagerService: Call updateNetworkState on providers that are disabled.
2010-05-12 07:49:45 -07:00
Jean-Michel Trivi
ea37d9b489 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 caused the completion listen
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698
2010-05-12 07:48:50 -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
Dianne Hackborn
7e76b6d191 am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?
2010-05-11 10:18:55 -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
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
Robert Greenwalt
d6d115173a am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp

* commit 'f9dc24de53890e0a8289a4349562ed4bd9611974':
  Fix ThrottleService wifi interaction
2010-05-06 17:16:04 -07:00
Robert Greenwalt
fee4683f47 Fix ThrottleService wifi interaction
When we switch to another network (or even just lose mobile data) the mobile
interface is either brought down or destroyed altogether.  That means any
throttling rules we've told the kernel about get lost.

This change notices when our interface comes up and reinstates throttling
if needed.

bug:2660287
Change-Id: I4c6ebf78acc59ed66b95984a1e8b7c2ffbc22dcb
2010-05-06 16:45:43 -07:00
Suchi Amalapurapu
9dfc697163 am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo
Merge commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c' into froyo-plus-aosp

* commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c':
  Fix 2656989. Clean up update to updated system applications.
2010-05-05 17:50:34 -07:00
The Android Open Source Project
f78964490d merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Suchi Amalapurapu
c1d07d9beb Fix 2656989. Clean up update to updated system applications.
Change-Id: Ic66b00926c45fac43396f1f8f23d0865ba77faba
2010-05-05 14:06:17 -07:00
Dianne Hackborn
c2da11d826 Merge "Set alpha value for newly created dim surface." 2010-05-04 23:58:26 -07:00
Dianne Hackborn
3445dae3f5 am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp

* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:22:39 -07:00
Dianne Hackborn
4416c3d6e4 Fix issue #2643754: Launcher is caching widget layouts for too long
With the .apk file names now changing during an update, we need
to make sure to flush all caches related to a package when the
package is removed.  Otherwise we can continue to use the old
package, since its old file may still exist if we try to load it
too soon.

Change-Id: I15f08dffca3feac999dbca4f24bef12a30ca0a66
2010-05-04 17:22:49 -07:00
The Android Open Source Project
6de3a6fdd3 merge from open-source master
Change-Id: I5f552b45caae639170674213c23f154437b58afd
2010-05-04 09:20:16 -07:00
Romain Guy
5bc30057e0 Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -07:00
The Android Open Source Project
007ad7700a merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
2010-05-03 16:19:31 -07:00
Patrick Tsai
bd742e4336 Fix typo of <p> end tag in appwidgets.xml
Change-Id: Ic1f4d8ade0d32f3b74decbe557d4275dc2e19466
2010-05-01 00:30:19 +08:00
Dianne Hackborn
d8f34720a1 am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update
Merge commit 'c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp

* commit 'c956f37567593a71271bae107eafec47575f7dcc':
  Fix issue #2641875: Apps on sdcard not accesible after update
2010-04-29 12:20:42 -07:00
Dianne Hackborn
c956f37567 Fix issue #2641875: Apps on sdcard not accesible after update
Change-Id: I541aa040939e6a872f0b7e8e82e44f96de49d97a
2010-04-29 11:56:40 -07:00
Jey
2eebf5cacd 'uses-library' was not working for persistent applications.
Fix by generating the applicationInfo, when asked for info.

Change-Id: I44686d5a306562c6649148dce8f709e682adcdf4
2010-04-29 08:19:06 -07:00
Amith Yamasani
087b25f7e2 am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo
Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp

* commit '6e4895b63aa64a8df64dd69c49a414b7566932d3':
  Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
2010-04-28 15:21:37 -07:00
Amith Yamasani
6e4895b63a Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 2010-04-28 15:18:15 -07:00
Amith Yamasani
c4938fd619 Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
The SimpleDateFormat was being cached and new timezone not being applied. Make sure
to apply the new timezone to the format object as soon as it changes.

Change-Id: I72abfef2e14cf5db5a6e8cb71b053380b695495c
2010-04-28 13:20:43 -07:00
Dianne Hackborn
725f731cb9 am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo
Merge commit 'bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp

* commit 'bc5a03286a72dc3627cee313d473178f5a123049':
  Fix issue #2569139: Sapphire user cannot login to last.fm...
2010-04-28 13:14:43 -07:00
Dianne Hackborn
92cfa105f9 Fix issue #2569139: Sapphire user cannot login to last.fm...
...after upgrade from Donut to FRF01B

For realz this time.

Change-Id: I92bd12451b19a6006cf487a9dfa0b7c696a21122
2010-04-28 11:00:44 -07:00
Maciej Białka
9ee5c2215a Set alpha value for newly created dim surface.
Newly created dim surface has alpha set to 1 (opaque),
but it is assumed in dim animation code that it is 0 (transparent).
When new dim surface is created and expected dim value is calculated to 0
then alpha is never set making screen black (dut to default aplha=1)
when dim surface is shown.
2010-04-27 08:12:51 +02:00
Jean-Michel Trivi
8f36a744bc am cd24dae9: Merge "Fix bug 2605504 Don\'t leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. T
Merge commit 'cd24dae9ca6550b24333f889935e1de068759ce5' into froyo-plus-aosp

* commit 'cd24dae9ca6550b24333f889935e1de068759ce5':
  Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads
2010-04-26 18:05:28 -07:00
Jean-Michel Trivi
cd24dae9ca Merge "Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. The fix consists in quitting the Looper used for the previous sound when a new sound is started." into froyo 2010-04-26 18:02:35 -07:00
Jean-Michel Trivi
6cf3d09636 Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads
The Looper on the thread created in order to be notified of the
playback completion of notification sounds, was never stopped, causing
the threads to stay around in wait state.
The fix consists in quitting the Looper used for the previous sound
when a new sound is started.

Change-Id: Ia4b3d16b5447ffafacc093db3a7fe05574089935
2010-04-26 17:21:40 -07:00
Robert Greenwalt
b344456083 am 27fba679: Fix Throttle reset.
Merge commit '27fba6797b07583ef6c280bc287bf327e47f5e66' into froyo-plus-aosp

* commit '27fba6797b07583ef6c280bc287bf327e47f5e66':
  Fix Throttle reset.
2010-04-26 15:43:27 -07:00
Robert Greenwalt
27fba6797b Fix Throttle reset.
The start and end times were precisely the same so, a ">" check needed to be ">=".
Also removed useless code and removed the potential problem where continuous gradual
advancement of your start and end times would prevent resets.

bug:2629717
Change-Id: Ieced1965a5611a9b555e92bcf924ec350f2a80db
2010-04-26 12:29:14 -07:00
Robert Greenwalt
0ff9212d07 am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo
Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp

* commit '19681af44b7c7494ae8de28dab8aacc3e9d92390':
  Handle throttling being disabled via policy change
2010-04-26 11:18:45 -07:00
Robert Greenwalt
19681af44b Merge "Handle throttling being disabled via policy change" into froyo 2010-04-26 11:13:11 -07:00
Robert Greenwalt
cce83379ef Handle throttling being disabled via policy change
bug:2622543
Change-Id: Ic0c169094cdb4f80af9cfcbed116f59fda46a421
2010-04-23 17:35:29 -07:00
Dianne Hackborn
cdf96f75da am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit '8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp

* commit '8b0047f82504ebc9b282ed950a85a758b59c4e14':
  Fix typo when parsing external platform version from Settings.
2010-04-23 15:22:55 -07:00
Bryan Mawhinney
2131a3caa8 Fix typo when parsing external platform version from Settings.
May fix http://b/2569139

Change-Id: I437f614fd25512bd461812feddb091edcd12ccb7
2010-04-23 22:42:17 +01:00
Dianne Hackborn
994e39908b am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo
Merge commit '2adec762fbb61c73f612acb7463ba765de1296ad' into froyo-plus-aosp

* commit '2adec762fbb61c73f612acb7463ba765de1296ad':
  Fix issue #2621809: Kill! Kill! Kill!
2010-04-23 14:25:05 -07:00
Dianne Hackborn
2adec762fb Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 2010-04-23 14:23:39 -07:00
Dianne Hackborn
149427cd90 Fix issue #2621809: Kill! Kill! Kill!
Stop! Stop! Stop!  Spamming the log.

Change-Id: I13f432b49d8c85165873566d58e2fb2714b1263e
2010-04-23 14:20:03 -07:00
Robert Greenwalt
b6c770e4e3 am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp

* commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68':
  Respond to changes in throttle policy.
2010-04-23 13:52:18 -07:00
Robert Greenwalt
5bf16d6e8c Respond to changes in throttle policy.
We were updating limits and such before, but we were not applying them
to the current situation if we were already throttled.  Now it can result in
us throttling or changing our throttle rate or unthrottling or even making
the ui come or go (disabling/enable throttling)

bug:2622543
bug:2619879
Change-Id: I64a62634d54f4768ab8625f8d72f9f66a239cb19
2010-04-23 13:15:44 -07:00
Robert Greenwalt
1b5a9c5d2f am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo
Merge commit '251ccef0445d4456809bfc41a6344e2dae24f2c3' into froyo-plus-aosp

* commit '251ccef0445d4456809bfc41a6344e2dae24f2c3':
  Add a Throttle check shortly after boot.
2010-04-23 10:20:37 -07:00
Robert Greenwalt
251ccef044 Merge "Add a Throttle check shortly after boot." into froyo 2010-04-23 10:17:14 -07:00
Dianne Hackborn
4bcdd6b068 am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '90c6aec10f969acf9b171b82920480fb6aeb007f' into froyo-plus-aosp

* commit '90c6aec10f969acf9b171b82920480fb6aeb007f':
  Fix issue #2619247: Music sometimes stops playing when navigation talks
2010-04-22 16:26:59 -07:00
Dianne Hackborn
476a57e64a am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo
Merge commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp

* commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
  Fix issue #2608292: Fails to launch the video camera preview
2010-04-22 16:24:08 -07:00
Dianne Hackborn
90c6aec10f Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 2010-04-22 16:23:44 -07:00
Dianne Hackborn
8633e68ebd Fix issue #2619247: Music sometimes stops playing when navigation talks
When a service transitions from foreground to background, we now push it
to the top of the LRU list.  Also fix the activity manager to take care
of killing processes if we go beyond a reasonable number of background
process to keep around.

Change-Id: Ic9f44c02af7a111ee6f1d06142386b301948bafe
2010-04-22 16:11:18 -07:00
Dianne Hackborn
f09c1a247a Fix issue #2608292: Fails to launch the video camera preview
Need to clear the attached hidden flag on the window, even if it does
not yet have an actual surface.

Change-Id: I0a90f6b03cd8e347a3eae4d6bea3ab93f7128bf4
2010-04-22 15:59:21 -07:00