Commit Graph

1751 Commits

Author SHA1 Message Date
Craig Mautner
d8796d44d5 am 39308006: am e609a677: am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev
* commit '39308006d6868fa7be892276e31ff90943f8d99b':
  Make sure mFocusedStack is never the home stack.
2013-10-22 10:45:02 -07:00
Craig Mautner
39308006d6 am e609a677: am 74082349: Merge "Make sure mFocusedStack is never the home stack." into klp-dev
* commit 'e609a677f8ff02aa163d6136370b9fee0dec9096':
  Make sure mFocusedStack is never the home stack.
2013-10-22 10:42:48 -07:00
Craig Mautner
7408234985 Merge "Make sure mFocusedStack is never the home stack." into klp-dev 2013-10-22 17:36:57 +00:00
Craig Mautner
d1bbdb462a Make sure mFocusedStack is never the home stack.
There were circumstances where mFocusedStack could be assigned the
home stack. If this were ever to occur then all subsequent tasks would
be put on the home stack. This fix ensures that there is no way that
mFocusedStack will ever be assigned to the home task.

Fixes bug 11271189.

Change-Id: I7ddd9b6bcbf2787cbe2f44b461ad057ae2241f00
2013-10-22 09:53:20 -07:00
Craig Mautner
8e867f3810 am e0bebd29: am 0857e3b9: am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev
* commit 'e0bebd294e7d2b998cc71e77e99f311c6321a6a1':
  Do not delete stacks that are not empty.
2013-10-21 21:41:47 -07:00
Craig Mautner
e0bebd294e am 0857e3b9: am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev
* commit '0857e3b97a12bbd9f4d333b620bd7dfbd275c812':
  Do not delete stacks that are not empty.
2013-10-21 21:38:12 -07:00
Craig Mautner
19d9bd54d3 Do not delete stacks that are not empty.
The possibility existed that an activity was set to a task that it was
already being set to. If that were to happen, and it was the only
activity in the only task of the stack the stack would be deleted.
This fixes that situation and logs it as well to confirm that it does
fix bug 11272935. Logging to be deleted upon successful monkey run
exhibiting the log.

Change-Id: I436fdcc9a3734adad81d3ef90f29b93b3ac4dfcd
2013-10-21 20:05:26 -07:00
Dianne Hackborn
5d1bf06087 am 86f7f4a6: am 52ae2cd1: am fc69e2b5: Merge "Increase size of broadcast history lists on non-svelte devices." into klp-dev
* commit '86f7f4a68bd2f3da6035c7dabce4161bbe2c4c53':
  Increase size of broadcast history lists on non-svelte devices.
2013-10-17 09:43:21 -07:00
Dianne Hackborn
86f7f4a68b am 52ae2cd1: am fc69e2b5: Merge "Increase size of broadcast history lists on non-svelte devices." into klp-dev
* commit '52ae2cd1b1bc72c0624463e94d94087bd42a1fb8':
  Increase size of broadcast history lists on non-svelte devices.
2013-10-17 09:21:52 -07:00
Dianne Hackborn
fc69e2b5ad Merge "Increase size of broadcast history lists on non-svelte devices." into klp-dev 2013-10-17 16:13:24 +00:00
Dianne Hackborn
4c51de4933 Increase size of broadcast history lists on non-svelte devices.
Change-Id: Ibd25379778dac8eb1aed30d4788e032f290d9b69
2013-10-16 23:34:35 -07:00
Dianne Hackborn
eceecfd224 am 25e7240e: am 519d8895: am 9c446d82: Merge "Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings." into klp-dev
* commit '25e7240e997d9af058f2700f7626b8c9d155ee3a':
  Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings.
2013-10-16 14:08:59 -07:00
Dianne Hackborn
25e7240e99 am 519d8895: am 9c446d82: Merge "Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings." into klp-dev
* commit '519d8895a29dd78f5250ee2ececac4e03a6f5b70':
  Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings.
2013-10-16 14:05:52 -07:00
Dianne Hackborn
2a272d42a3 Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings.
Two problems addressed here:

- If a call to startActivity() comes in on an activity that is finishing, we can
  end up putting the new activity in a stack that isn't actually in use any more
  (if the finishing activity is the last one on that stack).  This is a bad case,
  anyway, so if this happen the treat it as not being called on an existing
  activity and switch to NEW_TASK to find a task for it.

- There was a bug in handling PACKAGE_CHANGE broadcasts that would result in the
  app's processes being killed, even though the cleanup through the activities
  was done.  This could leave the activity stack in a bad state.  Fix this to
  correctly provide an app id for the changing package so that its processes are
  killed.

Change-Id: Iece04e0cf95025c3d30353d68bf3d14fd39d44c3
2013-10-16 13:34:33 -07:00
Craig Mautner
33379fb317 am 67122f46: am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev
* commit '67122f46be4ab186c1f88780a2043b458797254a':
  Remove debug logging.
2013-10-15 17:37:24 -07:00
Craig Mautner
35cb3efc8a am f7a64d2f: am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev
* commit 'f7a64d2f123897a255adf2e3ea3c60f09b750b2d':
  Restore window manager stack order on user switch.
2013-10-15 17:37:21 -07:00
Craig Mautner
67122f46be am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev
* commit '504b60453f30b78da3a13e022a1d8a7badf26ae1':
  Remove debug logging.
2013-10-15 17:33:26 -07:00
Craig Mautner
f7a64d2f12 am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev
* commit 'd68cd8cc40226dfd0b63227b6c186de4a4fd9ba0':
  Restore window manager stack order on user switch.
2013-10-15 17:33:23 -07:00
Craig Mautner
4270ebc7db Merge "Remove debug logging." into klp-dev 2013-10-16 00:27:50 +00:00
Craig Mautner
a7f2bd4da7 Remove debug logging.
Change-Id: I5d7c11e8b8525bfc8eb87bb0fff4f71337b4a39d
2013-10-15 16:13:50 -07:00
Craig Mautner
4f1df4faed Restore window manager stack order on user switch.
Only the activity stacks were being restored. Also add needed debug
logs.

Fixes bug 11223831.

Change-Id: Ief42688721c49e8cea14277619c797bf7c25b859
2013-10-15 15:44:14 -07:00
Craig Mautner
6353ea33ad am 209dc77a: am 910deb71: am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev
* commit '209dc77a6a6bd07f380bb2ee70169fef09ad7fa4':
  Clear displayStartTime whenever starting activity.
2013-10-15 04:03:26 -07:00
Dianne Hackborn
06d6a7548e am 9aded5ab: am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev
* commit '9aded5abd65a2c69090abece37a7825a52ca3af0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
2013-10-15 04:03:09 -07:00
Craig Mautner
209dc77a6a am 910deb71: am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev
* commit '910deb7155352c8d95e6351fc3efd4eac6b463a5':
  Clear displayStartTime whenever starting activity.
2013-10-14 19:02:12 -07:00
Dianne Hackborn
9aded5abd6 am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev
* commit '827c5af02de29424ea80f1ccfe525e681d0b74f0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
2013-10-14 19:01:55 -07:00
Craig Mautner
cf8a6ca9aa Merge "Clear displayStartTime whenever starting activity." into klp-dev 2013-10-15 01:28:48 +00:00
Craig Mautner
1e8b872edc Clear displayStartTime whenever starting activity.
setLaunchTime() was only being called from resumeTopActivityLaunched()
but also needed to be called from minimalResumeActivityLocked().

Fixes bug 11104901.

Change-Id: I35c994562dffaf75de014021c775e398224eb3a3
2013-10-14 18:24:52 -07:00
Dianne Hackborn
878deb3c7b Fix issue #11223335: APR: Lots of failures in procstats due to...
...bad cleanup of crashing processes

We now have a special path for crashing processes, to silently
clean up their state.

Also some tweaks to Log/Slog.wtf to get better stack crawl
summaries in APR.

Change-Id: Ieced26989907a6e7615b6fa033813fced78d7474
2013-10-14 17:15:40 -07:00
Jeff Sharkey
3a58678ac2 am 7a531be1: am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev
* commit '7a531be13bc9ba6218747c185cd199c9e864c60f':
  Throw when taking non-existant Uri permission.
2013-10-14 11:54:21 -07:00
Craig Mautner
2e5ab4bf24 am aaae59c3: am 23d4edde: am ea7c1e24: Merge "Add null check when determining mOnTopOfHome" into klp-dev
* commit 'aaae59c39ce0142bdef3067b9acd039b3c743c6c':
  Add null check when determining mOnTopOfHome
2013-10-14 11:28:42 -07:00
Craig Mautner
edda7e4cdb am 10caa3b8: am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front.
* commit '10caa3b8b1181d3dc77870487ae031a7d59f70f7':
  Test for task in front must include stack in front.
2013-10-14 10:53:11 -07:00
Craig Mautner
5d140e0e56 am 3e9230d4: am 22e4a1b8: am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev
* commit '3e9230d42fb29a160af0eb1bc6ebb4a2f116e808':
  Only return to home if the foreground task is removed.
2013-10-14 10:50:53 -07:00
Craig Mautner
8a3146e960 am 272b0929: am 6b5fc882: am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev
* commit '272b0929a9022f4f1cfc6b72fdbb9cb2416e5bd2':
  When removing a task that was on home, put home on top.
2013-10-14 10:49:55 -07:00
Jeff Sharkey
7a531be13b am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev
* commit '94758633943e77c820fd77f96329848cc7f31230':
  Throw when taking non-existant Uri permission.
2013-10-14 10:29:15 -07:00
Jeff Sharkey
b5da7b23df Merge "Throw when taking non-existant Uri permission." into klp-dev 2013-10-14 17:24:14 +00:00
Jeff Sharkey
582f712406 Throw when taking non-existant Uri permission.
Bug: 11080911
Change-Id: Ib73a20f497b447aebe69c88266369605e69a7812
2013-10-14 10:01:33 -07:00
Craig Mautner
aaae59c39c am 23d4edde: am ea7c1e24: Merge "Add null check when determining mOnTopOfHome" into klp-dev
* commit '23d4edde94b508c03280fd701b797f3a84db23fc':
  Add null check when determining mOnTopOfHome
2013-10-14 09:43:09 -07:00
Craig Mautner
ea7c1e24a2 Merge "Add null check when determining mOnTopOfHome" into klp-dev 2013-10-14 16:38:48 +00:00
Craig Mautner
d99384d067 Add null check when determining mOnTopOfHome
Fixes bug 11198896.

Change-Id: I7b35c8a7156f03f8dab0598b55ef327e593f6427
2013-10-14 07:09:18 -07:00
Craig Mautner
10caa3b8b1 am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front.
* commit 'd3b2fa49492cfe0ee81f0a66887d1e79d3bf0d2d':
  Test for task in front must include stack in front.
2013-10-13 19:26:52 -07:00
Craig Mautner
e1db0dd089 Test for task in front must include stack in front.
The CL that ensured that a dying task must be in front of the user
(ag/374996) only checked that the task was at the top of /a/ stack,
not on top of the frontmost stack. This checks the stack for being
frontmost before switching to home.

Fixes bug 11208762.

Change-Id: I43f6d380e7a880ec19db03711ada6c7437e15f73
2013-10-14 02:20:57 +00:00
Craig Mautner
3e9230d42f am 22e4a1b8: am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev
* commit '22e4a1b8e5ca72988bbdd7da2b7fe38f53d85c26':
  Only return to home if the foreground task is removed.
2013-10-12 18:46:05 -07:00
Craig Mautner
2219b751b6 Only return to home if the foreground task is removed.
The previous fix that returned to home when a task on top of home was
removed was too broad. If that task was not the foreground task it was
not a good idea to bring the home screen to the front.

Fixes bug 11198552.

Change-Id: I14e5fdc167011f25e0e8490c3e52c5c1dcbffbff
2013-10-12 11:26:08 -07:00
Craig Mautner
272b0929a9 am 6b5fc882: am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev
* commit '6b5fc882d1823c8922860ef284442442b635111b':
  When removing a task that was on home, put home on top.
2013-10-11 19:48:12 -07:00
Craig Mautner
8e5695778f When removing a task that was on home, put home on top.
Killing an app that was launched from home was not relaunching home.
Previous situations relaunched the next app (i.e. home) based on the
task flag. However, when an app dies the relaunch is deferred until
the TaskRecord has long been forgotten. This fix rearranges the stacks
immediately upon the TaskRecord being removed from the stack. Then the
next resumeTopActivities() call will start the home task.

Fixes bug 11189555.

Change-Id: I0e09350a7db55ea8b38cce7bf4b69923a6b99494
2013-10-11 17:36:59 -07:00
Craig Mautner
2ae3a71820 am 6b2a6a11: am b1ce68f5: am 09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev
* commit '6b2a6a1140d4144c2771dc44fa765268446243d4':
  Add test for topmost home stack activity being home.
2013-10-11 12:59:58 -07:00
Craig Mautner
6b2a6a1140 am b1ce68f5: am 09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev
* commit 'b1ce68f5a4064d6c57cdc13e4708a0ee6bf5b970':
  Add test for topmost home stack activity being home.
2013-10-11 12:55:36 -07:00
Craig Mautner
d2bb1dd031 am 7bc5cdc0: am 4732660a: am ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev
* commit '7bc5cdc0e9ef61438135243db83ab426fa97acae':
  Make an exception for screenshot optimization.
2013-10-11 12:55:23 -07:00
Craig Mautner
7bc5cdc0e9 am 4732660a: am ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev
* commit '4732660a50f3373812e8ae55cbda264d469bfded':
  Make an exception for screenshot optimization.
2013-10-11 12:50:05 -07:00
Craig Mautner
09cb9bdcc8 Merge "Add test for topmost home stack activity being home." into klp-dev 2013-10-11 19:50:03 +00:00