drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,667 Commits 1 Branch 0 Tags
Commit Graph

1737 Commits

Author SHA1 Message Date
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
Craig Mautner
760b2314d9 Add test for topmost home stack activity being home. 
And restarts home if test fails.

Fixes bug 11118615.

Change-Id: I3b6c544d479b467f10febff512798c2db8e32f74
 2013-10-11 11:57:07 -07:00
Craig Mautner
3474040486 Make an exception for screenshot optimization. 
Screenshots were not being made for tasks with the flag
FLAG_EXCLUDE_FROM_RECENTS set. But if the task is in the foreground
the shot should be taken even with the flag set. This fix adds a test
for tasks being in the foreground.

Fixes bug 11170567.

Change-Id: If42db7f43ed1dd8d2b16b68824adc813b31c94f0
 2013-10-11 11:05:35 -07:00
Dianne Hackborn
ba7d4a5866 am 7ea73db9: am 0faf411f: am fa883071: Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 
* commit '7ea73db9ddcb9ce33480a21834d6f99a9d1b141d':
  Fix issue #11175600: Proc stats is aggregating stats in the wrong direction
 2013-10-10 19:26:56 -07:00
Dianne Hackborn
7ea73db9dd am 0faf411f: am fa883071: Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 
* commit '0faf411fb494d1d7b1fbfdb0c9b45dc83a2b262c':
  Fix issue #11175600: Proc stats is aggregating stats in the wrong direction
 2013-10-10 19:20:56 -07:00
Dianne Hackborn
fa8830715d Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 2013-10-11 01:29:26 +00:00
Dianne Hackborn
59da67900d Fix issue #11175600: Proc stats is aggregating stats in the wrong direction 
Change-Id: I7f06fbde8f52296cb2932003b4da77b2c68a6011
 2013-10-10 18:27:24 -07:00
Dianne Hackborn
222c5f80e5 am 16b43a77: am 17c21a30: am 2c09e8cd: Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 
* commit '16b43a779166d419875410d598182b852a5f90a3':
  Fix issue #11157301: Bad process stats when apps are binding to long-running services
 2013-10-10 16:23:54 -07:00
Dianne Hackborn
16b43a7791 am 17c21a30: am 2c09e8cd: Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 
* commit '17c21a3007a2321ae8805a397c3566411a60cba0':
  Fix issue #11157301: Bad process stats when apps are binding to long-running services
 2013-10-10 16:21:39 -07:00
Dianne Hackborn
2c09e8cdf6 Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 2013-10-10 23:11:59 +00:00
Dianne Hackborn
32366b29c4 Fix issue #11157301: Bad process stats when apps are binding to long-running services 
We now treat PROCESS_STATE_TOP more specially.  When a process has another
client bound to it that is TOP, it will only allow itself to go in the TOP
state if it is not already running for another significant reason.

Change-Id: Ia3856406bd481bf6e98d55100a5513ccf4060e0d
 2013-10-10 16:10:32 -07:00
Jeff Sharkey
5d1c7661fe am 852c7b15: am 6743c171: am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev 
* commit '852c7b15a5a96b0c553e971fe9af72f4ce50bedd':
  Guard against NPE when using existing process.
 2013-10-10 10:24:37 -07:00
Jeff Sharkey
852c7b15a5 am 6743c171: am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev 
* commit '6743c1712e1051ae99639a7d90912c54a0be8b24':
  Guard against NPE when using existing process.
 2013-10-10 10:21:29 -07:00
Jeff Sharkey
2ffa50df6f Guard against NPE when using existing process. 
Bug: 11167561
Change-Id: I51ca7daa71504119fb64bc7bc2b7da4e03b13861
 2013-10-10 09:52:48 -07:00
Jeff Sharkey
6699ae2b76 am 45d23585: am 11591b73: am b3da3db3: Merge "Surface outgoing Uri permission grants." into klp-dev 
* commit '45d2358510f9670ddf25cc49ee2639e3d41708f7':
  Surface outgoing Uri permission grants.
 2013-10-09 15:17:34 -07:00