215 Commits

Author SHA1 Message Date
The Android Open Source Project
1da49e45a8 merge from open-source master
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
2010-03-19 16:36:32 -07:00
Josh Bartel
2ecce34f2f Synchronize access to *Locked() functions
Several places were calling *Locked() functions without properly
synchronizing.

Change-Id: Ie39b6592da8bb5f4a5a1e738c45f228256116ec4
2010-03-11 08:30:16 -06:00
Josh Bartel
7f2087435e Rename functions which ought to be named *Locked()
Several functions operate on variables to which access needs to be
synchronized.  However, it happens that the functions in question
are only ever called from places which have already synchronized.
Therefore, nothing is really wrong, but the functions ought to
have 'Locked' appended to their names, to indicate that it is the
caller's responsibility to synchronize before calling them.

Change-Id: I44e7dc0dff6da9436677cb10908dce41ffeba195
2010-03-10 17:27:48 -06:00
The Android Open Source Project
4dcd2ee8ca merge from open-source master 2010-03-01 09:30:21 -08:00
Magnus Edlund
7bb2581e6f Fix problem with restarting an application process that recently has died.
There exists a race condition when starting a process that recently has died.
If the ActivityManager receives the death notification for the died process
after the new process has been started but before an application thread has
been attached to the new process will the newly created process be removed
during the cleanup of the died process. If this happens when sending a broadcast
could it result in an ANR.

This is solved by doing the clean up before starting a new process that uses
the same process record.
2010-03-01 09:12:07 -08:00
Joe Onorato
6371a2d31f am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp

* commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af':
  Don't crash the system process when apps give us a bad foreground service notification.
2010-02-18 04:52:46 -08:00
Joe Onorato
34fcf97103 Don't crash the system process when apps give us a bad foreground service notification. 2010-02-18 07:45:17 -05:00
Dianne Hackborn
5f64128568 am b1c4a2a3: Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
Merge commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7' into eclair-plus-aosp

* commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7':
  Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
2010-01-19 19:59:04 -08:00
Dianne Hackborn
b1c4a2a3b3 Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
Make sure calls into the notification manager are not done with the
activity manager lock held.

Change-Id: Ib53c3b9f46160d94ee1e7079b1a5123e0d1225d8
2010-01-19 15:36:42 -08:00
Dianne Hackborn
e9b86b5421 am 474731d5: Merge change I2ffe306f into eclair
Merge commit '474731d5efb30c1e9184f998610054747eb8e764' into eclair-plus-aosp

* commit '474731d5efb30c1e9184f998610054747eb8e764':
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-11 18:28:45 -08:00
Dianne Hackborn
871ecdce67 Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
Make sure the application is always given the most recent configuration
when launcher.  Use the current configuration, instead of whatever happens
to be set by the app, for reporting what it was launched with.

Change-Id: I2ffe306f56cc9092b640546dd0a28d2c29b9c0b3
2009-12-11 15:24:33 -08:00
Suchi Amalapurapu
3f075ad943 am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-plus-aosp

* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:01:57 -08:00
Suchi Amalapurapu
be1c422a73 If the usage stats file doesn't exist in the first place there is no need to
backup and short return.
2009-12-04 13:59:38 -08:00
Dianne Hackborn
3235ccac1f am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-plus-aosp

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 16:36:30 -08:00
Dianne Hackborn
f670ef7235 Work on issue 2259506: camera ANRed and then device runtime restarted
If a process fails to come up, we could leave content providers and
services hanging around.

Change-Id: Iff5b8ce3b933580954724338a89e110e45f1b00c
2009-11-16 13:59:16 -08:00
Dianne Hackborn
fac7bd8345 am 826d17c0: A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-plus-aosp

* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
  A little more on #2256270: Package manager sends bad broadcasts when components change
2009-11-13 11:12:11 -08:00
Dianne Hackborn
826d17c069 A little more on #2256270: Package manager sends bad broadcasts when components change
Don't go through all this work if the enabled state hasn't changed.

Change-Id: If7393f53d6c0d0770960bb37bcaa5adebdbb3099
2009-11-13 10:59:42 -08:00
Dianne Hackborn
7a2d9782f9 am 532d5603: Merge change I80022375 into eclair
Merge commit '532d56034532809da7691059742371c1b4d0656c' into eclair-plus-aosp

* commit '532d56034532809da7691059742371c1b4d0656c':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
2009-11-11 19:13:15 -08:00
Dianne Hackborn
af194fe6af am 2ade6421: Merge change I775e1ec0 into eclair
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-plus-aosp

* commit '2ade6421f2d6dd615b559c951deace7143958b90':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
2009-11-11 18:53:29 -08:00
Dianne Hackborn
362d5b9b64 Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
You can no longer receive CONFIGURATION_CHANGED in a manifest, which is really really
bad (launching apps every time the screen is rotated!).  A new LOCALE_CHANGED broadcast
is sent that you can receive in a manifest.

Change-Id: I80022375f0716db2e672382a29db3cea1af74702
2009-11-11 18:26:06 -08:00
Dianne Hackborn
12527f9fb1 Debugging for issue #2250075: Desk dock clock app sometimes doesn't
This adds a history of the last 100 broadcasts that is printed in the
debug log, to be able to see what recently happened at the time the
bug report was taken.  Also does some optimization of the printing of
the broadcast records to make it feasible to print this number of
entries.  (We kind-of need to do this because there are some broadcasts
like SIG_STR and SYNC_STATE_CHANGED that are being broadcast a LOT.)

Change-Id: I775e1ec0f63369c8bca8c83cee27b95ddc5ec450
2009-11-11 17:51:41 -08:00
Suchi Amalapurapu
7442abf98e am bf50200b: Merge change Ic9568e39 into eclair
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-plus-aosp

* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
  When tasks are moved to top or bottom, the app tokens are being rearranged.
2009-11-05 23:19:42 -08:00
Suchi Amalapurapu
c9568e3989 When tasks are moved to top or bottom, the app tokens are being rearranged.
The window token rearrangement is defered if an animation is
underway. Force a focus recomputation when the window tokens are finally
rearranged so that we have a valid focused window.
2009-11-05 19:13:18 -08:00
Amith Yamasani
99b5f8cf69 am 4ab2c777: Merge change I14fb81af into eclair
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-plus-aosp

* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
  Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
2009-11-05 13:16:40 -08:00
Amith Yamasani
14fb81af28 Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
This should remove the deadlock. I'm not absolutely positive that
it fixes it, as it's not easy to reproduce.
2009-11-05 11:41:58 -08:00
Eric Fischer
bf09620baf am fb872d1a: Merge change Id4d04def into eclair
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-plus-aosp

* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
  Fix a race that kept the locale picker from working under heavy CPU load.
2009-10-28 10:24:53 -07:00
Eric Fischer
d4d04def2c Fix a race that kept the locale picker from working under heavy CPU load.
The locale picker and the activity transition would both change the
configuration, and depending upon the timing, the activity transition
would undo what the locale picker had just done.  Usually it worked right,
but would often fail if the user changed locales just after a data wipe,
when the media scanner was working hard in the background to index
the contents of the SD card.

http://b/issue?id=2216298
2009-10-27 18:55:57 -07:00
Dianne Hackborn
8b54776edd am 8d9ddbe2: Merge change I1f30f3f1 into eclair
Merge commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3' into eclair-plus-aosp

* commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3':
  Fix #2201615: getCallingPackage returns calling process instead of calling package
2009-10-20 16:20:41 -07:00
Dianne Hackborn
9bbcb916c5 Fix #2201615: getCallingPackage returns calling process instead of calling package
Change-Id: I1f30f3f1ce8928796c1ab502d0c2dc02de86e8e7
2009-10-20 15:42:38 -07:00
Amith Yamasani
7f1e063b8a am f37447ba: Proper fix for zero signal strength and no_service. Fixes #2176141
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-plus-aosp

* commit 'f37447bad3773b62176baa837908daf6edb44273':
  Proper fix for zero signal strength and no_service. Fixes #2176141
2009-10-19 15:28:03 -07:00
Amith Yamasani
f37447bad3 Proper fix for zero signal strength and no_service. Fixes #2176141
Track phone service state changes and use a separate timer for out-of-service
since the hunting can timeout on some devices.

Store the timeout value in the config.xml, as it is device/network specific.

Settings App will also change to use the hunting duration to compute the cost
of zero signal.
2009-10-19 15:16:26 -07:00
Dianne Hackborn
93939786f9 am 2c6c5e6e: Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp

* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
  Fix issue #2176944: Need API so browser, others can determine memory size of device
2009-10-08 19:09:38 -07:00
Dianne Hackborn
374efe6a96 am d10d02f5: Merge change I490e01ba into eclair
Merge commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-plus-aosp

* commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
2009-10-08 18:43:54 -07:00
Dianne Hackborn
2c6c5e6e49 Fix issue #2176944: Need API so browser, others can determine memory size of device
Change-Id: I65d91cdb70df91b67fe84297dd6a94d26a785131
2009-10-08 18:43:47 -07:00
Dianne Hackborn
3612487d61 Fix issue #2174566: HOT STABILITY: NPE in activity manager
- Don't crash if the service's app process doesn't have a thread (this
  can happen if we are currently starting the process and then try to
  start the service again).
- Be more robust about deciding to start a service's process: try each
  time it is started; the startProcess call will take care of ignoring
  it if the process is already started.
- Fix some issues where we would leave dead processes on the low memory
  list.

Change-Id: I490e01ba7b45adc191bab7ace377b6873e284897
2009-10-08 16:22:03 -07:00
Dianne Hackborn
7a889217d7 am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 12:08:20 -07:00
Dianne Hackborn
ae9fc51765 am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-plus-aosp

* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-07 11:49:01 -07:00
Dianne Hackborn
031e4ac7dd am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-plus-aosp

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-07 11:44:12 -07:00
Dianne Hackborn
0c3154d3fc Fix issue #2163654: deadlock, runtime restart
Don't hold a lock when the activity thread is telling the activity manager
to release a provider.

This requires that the activity manager now keep a reference count on the
providers, because without the lock it is possible for activity thread to
call in to request the provider again before it has finished telling
about the release.

Change-Id: I5f912903891f4edae85e28819d4e6f14b8f2e688
2009-10-07 11:10:33 -07:00
Dianne Hackborn
68d881cf2d Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Tell the broadcast receiver whether it is getting an initial sticky value,
so it will be quiet about attempts to do ordered broadcast stuff.

Note that the original bug being reported was not actually a crash, just
an error log.  So all we are doing here is making the log quieter.

Change-Id: Iaf1b718d82093ec1197142410a64feff47eb3859
2009-10-05 15:52:32 -07:00
Dianne Hackborn
bd0a81ff1c Work on issue #2163789: Way too much logging
Dr.No from mcleron.

Change-Id: Iaca2268684f83fe8757e64db0b0e047a19755311
2009-10-04 14:48:47 -07:00
Dianne Hackborn
41829e0138 am e88846ee: Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6' into eclair-plus-aosp

* commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6':
  Semi-workaround for #2027266: app drawer showing up on the side of the screen
2009-09-30 23:42:37 -07:00
Dianne Hackborn
e88846eeaf Semi-workaround for #2027266: app drawer showing up on the side of the screen
(when booted while docked)

This isn't really a fix, but we now have the activity report the configuration
it actually launched in, so the activity manager will later adjust it if
needed.  Should help us recover from hitting the race in this particular case.

Change-Id: I3bb83a48c2d692b4cb1822d8ae7d924cfa9187b2
2009-09-30 23:25:53 -07:00
Christopher Tate
6678aeccec am 436344ae: Turn off most of the backup-related debug logging
Merge commit '436344ae12c819f58306ceb94241a266141e1218' into eclair-plus-aosp

* commit '436344ae12c819f58306ceb94241a266141e1218':
  Turn off most of the backup-related debug logging
2009-09-30 21:13:34 -07:00
Christopher Tate
436344ae12 Turn off most of the backup-related debug logging
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.

Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
2009-09-30 17:07:37 -07:00
Dianne Hackborn
8f4f41df55 am 48e9a0dd: Merge change Ice5e9209 into eclair
Merge commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc' into eclair-plus-aosp

* commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc':
  Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
2009-09-30 16:24:01 -07:00
Suchi Amalapurapu
7a51b14d9f am 094e3e0b: Merge change Icb89d482 into eclair
Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp

* commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf':
  Check if rename of backed up file fails before persisting new changes.
2009-09-30 16:23:45 -07:00
Android (Google) Code Review
48e9a0dd66 Merge change Ice5e9209 into eclair
* changes:
  Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
2009-09-30 18:47:45 -04:00
Suchi Amalapurapu
8550f25523 Check if rename of backed up file fails before persisting new changes.
If not these system services will end up with inconsistent settings files
when the device runs out of storage.
Delete mangled settings file in PackageManager if the current write fails
so that we don't end up overwriting the backed up version with the
mangled version
Include null check when retrieving fwd locked resource for an existing package
2009-09-30 15:36:29 -07:00
Dianne Hackborn
1bcf5a8a61 Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
Change-Id: Ice5e920998fbe7eb1862f0ee7dca99876482b659
2009-09-30 15:22:29 -07:00