Commit Graph

12426 Commits

Author SHA1 Message Date
Craig Mautner
2c34bd6a9a am cd569b31: am e8a94224: Merge "Return tasks in correct order." into klp-dev
* commit 'cd569b31d398fe846eeee567d2816a3bb93dd493':
  Return tasks in correct order.
2013-09-20 09:58:22 -07:00
Christopher Tate
0719715586 am 654aad21: am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev
* commit '654aad21609642f7d0891962d72c0dfd4077fb94':
  Support for "not the home app you're looking for" metadata
2013-09-20 09:58:18 -07:00
Amith Yamasani
25fd841bd5 am 80af4f7b: am 7301bd96: Merge "Use a separate thread for services that do NTP lookup" into klp-dev
* commit '80af4f7b098aa912dcc7c2ccaf4a559e15e608ff':
  Use a separate thread for services that do NTP lookup
2013-09-20 09:58:08 -07:00
Craig Mautner
cd569b31d3 am e8a94224: Merge "Return tasks in correct order." into klp-dev
* commit 'e8a9422495d6af9fc68cf4e838a4a5f19177034b':
  Return tasks in correct order.
2013-09-19 13:05:43 -07:00
Craig Mautner
e8a9422495 Merge "Return tasks in correct order." into klp-dev 2013-09-19 20:03:24 +00:00
Christopher Tate
654aad2160 am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev
* commit '9c5cc571e5abf97a816fea2b04cd1e711e83564c':
  Support for "not the home app you're looking for" metadata
2013-09-19 12:48:19 -07:00
Christopher Tate
9c5cc571e5 Merge "Support for "not the home app you're looking for" metadata" into klp-dev 2013-09-19 19:46:20 +00:00
Christopher Tate
bd413f6c05 Support for "not the home app you're looking for" metadata
* Make sure that pm.getHomeActivities() returns the activity metadata
  as well, so that the caller can trace the reference

* Add a public canonical name for that metadata key

Bug 10749961

Change-Id: Ic4d0750d61001ffe5af180398f042afa30eea1ce
2013-09-19 12:31:49 -07:00
Amith Yamasani
80af4f7b09 am 7301bd96: Merge "Use a separate thread for services that do NTP lookup" into klp-dev
* commit '7301bd96c43f1a3604e88612c1a4214d57f88000':
  Use a separate thread for services that do NTP lookup
2013-09-19 12:21:12 -07:00
Amith Yamasani
7301bd96c4 Merge "Use a separate thread for services that do NTP lookup" into klp-dev 2013-09-19 19:17:51 +00:00
Craig Mautner
c0fd805234 Return tasks in correct order.
Fixed ActivityManager.getRunningTasks().

Fixes bug 10705790.

Change-Id: Ia3f66e592e08a87896a1ab59f980618ec5310dfe
2013-09-19 11:20:17 -07:00
Amith Yamasani
450a16b33f Use a separate thread for services that do NTP lookup
Some services do periodic network time lookups and can wedge the other operations on
BackgroundThread and IO Thread, causing Watchdog to kill the runtime. So best to put
those handlers on separate threads.

Going forward, should convert NTP lookups to be async with callbacks.

Bug: 10646480
Change-Id: I8c7ba6052cb3539575712c2099a706b14ff60196
2013-09-19 10:57:16 -07:00
Craig Mautner
0bb53db2fa am acc7f154: am 81d1689c: Merge "Remove debug logging for b/106899184." into klp-dev
* commit 'acc7f154a780489a1b3dcc9e1677c0389c088b5d':
  Remove debug logging for b/106899184.
2013-09-19 07:56:58 -07:00
Craig Mautner
acc7f154a7 am 81d1689c: Merge "Remove debug logging for b/106899184." into klp-dev
* commit '81d1689ceb3252d2cfa3397cd6a5b3337a3a6a75':
  Remove debug logging for b/106899184.
2013-09-19 07:53:03 -07:00
Craig Mautner
81d1689ceb Merge "Remove debug logging for b/106899184." into klp-dev 2013-09-19 14:50:41 +00:00
Jim Miller
8b7ea57f8e am cd87d0ab: am f4292478: Merge "Fix keyguard/Keystore storage issue" into klp-dev
* commit 'cd87d0ab9623d5028d767e8167923c57aa2bac0d':
  Fix keyguard/Keystore storage issue
2013-09-18 17:06:21 -07:00
Craig Mautner
ec9cf65b55 Remove debug logging for b/106899184.
Change-Id: I1e5f959a6d674b4bf9609553f28e66ffee367f5c
2013-09-18 17:04:45 -07:00
Jim Miller
cd87d0ab96 am f4292478: Merge "Fix keyguard/Keystore storage issue" into klp-dev
* commit 'f429247867ac524cf63bc01499ac47a90ebcaca9':
  Fix keyguard/Keystore storage issue
2013-09-18 17:02:48 -07:00
Jim Miller
f429247867 Merge "Fix keyguard/Keystore storage issue" into klp-dev 2013-09-19 00:00:22 +00:00
Jason Monk
41d6e07bf2 am 275d1adf: am ff65c6da: Merge "Fix PacManager to not unbind when no connection" into klp-dev
* commit '275d1adf0a8d7817f9a28c92822f5adb405528ff':
  Fix PacManager to not unbind when no connection
2013-09-18 16:55:28 -07:00
Jason Monk
275d1adf0a am ff65c6da: Merge "Fix PacManager to not unbind when no connection" into klp-dev
* commit 'ff65c6daab5268c28b3663cd02c1b3dfa6f1c90a':
  Fix PacManager to not unbind when no connection
2013-09-18 16:53:06 -07:00
Jason Monk
ff65c6daab Merge "Fix PacManager to not unbind when no connection" into klp-dev 2013-09-18 23:51:07 +00:00
Craig Mautner
d4338177c0 am 2325fd5d: am 4ef2693a: Revert back to a single home app in mHomeProcess
* commit '2325fd5d1192553c7056eeec2e1e458886dd173f':
  Revert back to a single home app in mHomeProcess
2013-09-18 16:05:29 -07:00
Craig Mautner
2325fd5d11 am 4ef2693a: Revert back to a single home app in mHomeProcess
* commit '4ef2693a243b308fad775a8a1691963c51ac925e':
  Revert back to a single home app in mHomeProcess
2013-09-18 16:02:59 -07:00
Craig Mautner
4ef2693a24 Revert back to a single home app in mHomeProcess
The idea of multiple processes serving as home was unfeasible.

- Revert "Allow for more than one home app." commit
e428a7f662.
- Assign ActivityManagerService.mHomeProcess to the process of the
root activity of the home task.

Addresses bug 10342471.

Change-Id: Ifb494626107d24de1306e320a18206d5b176a7c0
2013-09-18 15:48:28 -07:00
Kenny Root
b5a14f0fc9 resolved conflicts for merge of 1995a7de to master
Change-Id: I9915ae06d460696b24cbee935738267911baa580
2013-09-18 14:23:58 -07:00
Dianne Hackborn
1995a7de5b am b9466db4: Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev
* commit 'b9466db4a56564101a26865962dda87aaeab56ff':
  Finish issue #10779747: Calendar Storage crash observed...
2013-09-18 13:37:02 -07:00
Dianne Hackborn
b9466db4a5 Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev 2013-09-18 20:34:11 +00:00
Craig Mautner
7c4e91b133 am 566f7fed: am 138685d9: Merge "Move flag for home launching from activity to task." into klp-dev
* commit '566f7fede191ab2667237e147bee6b74c05ded32':
  Move flag for home launching from activity to task.
2013-09-18 12:53:10 -07:00
Craig Mautner
566f7fede1 am 138685d9: Merge "Move flag for home launching from activity to task." into klp-dev
* commit '138685d9db005cbd62ede45eb066a2e672db9588':
  Move flag for home launching from activity to task.
2013-09-18 12:50:31 -07:00
Dianne Hackborn
6285a32f74 Finish issue #10779747: Calendar Storage crash observed...
...while setting up a new user from settings.

We can now delay broadcasts when there are enough background services
currently starting (still set to 1 for svelte devices, 3 for normal
devices).

Add new intent flag to not allow receivers to abort broadcasts, which
I use to fix an issue with the initial BOOT_COMPLETED broadcast not
actually requesting pss data at the right time -- it can now be sent
as an ordered broadcast without the ability for the receivers to cancel
it.

Change-Id: I51155bbbabe23e187003f3e2abd7b754e55d3c95
2013-09-18 12:09:47 -07:00
Craig Mautner
ae7ecab400 Move flag for home launching from activity to task.
The variable ActivityRecord.mLaunchHomeTaskNext was used to indicate
that the home task should be launched when the activity completed.
This only mattered when it was at the end of a task. As the activity
launched other activities within the same task it needed to be
migrated from activity to activity and task to task. This became
too complicated and was at the wrong level to begin with.

By moving the flag to TaskRecord.mOnTopOfHome the logic is simpler
and the results more predictable.

Fixes bug 10602256.

Change-Id: If0b752522b77be9918f1dba221d0ff670fc01af8
2013-09-18 11:48:14 -07:00
Jason Monk
bc018d89c2 Fix PacManager to not unbind when no connection
PacManager previously would unbind service even when there was no
connection.  This means that multiple set proxies of no PAC after a PAC was
present would cause the framework to crash.

Bug: 10801296
Change-Id: I4387b50b6510cea3ee73425c8a0a837f816b0ce1
2013-09-18 09:28:29 -04:00
Dianne Hackborn
397196870e am 12b22479: am 222920c4: Merge "Maybe fix issue #10797796: IllegalStateException in ProcessState..." into klp-dev
* commit '12b224799626a506ff3cb3c01cdfdc5b66bce5e3':
  Maybe fix issue #10797796: IllegalStateException in ProcessState...
2013-09-17 17:39:32 -07:00
Dianne Hackborn
12b2247996 am 222920c4: Merge "Maybe fix issue #10797796: IllegalStateException in ProcessState..." into klp-dev
* commit '222920c46044d4782df3cd5b3c6c7e6578659903':
  Maybe fix issue #10797796: IllegalStateException in ProcessState...
2013-09-17 17:36:15 -07:00
Dianne Hackborn
222920c460 Merge "Maybe fix issue #10797796: IllegalStateException in ProcessState..." into klp-dev 2013-09-18 00:34:02 +00:00
Dianne Hackborn
53459a7020 Maybe fix issue #10797796: IllegalStateException in ProcessState...
...caused runtime restart

There were some situations where the package list could be set
with process stats when it shouldn't.  Not sure if this is causing
the problem, since there is no repro.

Also some improvements to debug output -- new commands to clear
all stats, print full details of stats, and print a one-day
summary (which should match what the UI shows).

Change-Id: I9581db4059d7bb094f79f2fe06c1ccff3e1a4e74
2013-09-17 17:30:34 -07:00
Craig Mautner
5b35bab44a am 2af9dd71: am 019f8cb8: Merge "Add bounds checks before accessing ArrayList." into klp-dev
* commit '2af9dd716ec117af602b86c0d26cc40eb733338e':
  Add bounds checks before accessing ArrayList.
2013-09-17 16:18:15 -07:00
Craig Mautner
2af9dd716e am 019f8cb8: Merge "Add bounds checks before accessing ArrayList." into klp-dev
* commit '019f8cb8a78c5584618655f5478d9a9f3dedc3f0':
  Add bounds checks before accessing ArrayList.
2013-09-17 16:15:20 -07:00
Craig Mautner
019f8cb8a7 Merge "Add bounds checks before accessing ArrayList." into klp-dev 2013-09-17 23:13:31 +00:00
Craig Mautner
dccb770b84 Add bounds checks before accessing ArrayList.
Add a test for emptiness before accessing either mTaskHistory[0] or
TaskRecord.mActivities[0]. This will keep us from hitting
IndexOutOfBoundsException.

Fixes bug 10789624.

Change-Id: If726df888a2c8b393788793b6220a6bffe2df883
2013-09-17 15:53:34 -07:00
David Braun
a2ee725744 am fdacf747: am 345d491b: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
* commit 'fdacf74764ed42b6550cefa0306621200517b36e':
  Implement new method for handling SMS/MMS on the platform
2013-09-17 15:18:13 -07:00
Craig Mautner
a4ac9a3ac4 am e0dcb7df: am bc65c1db: Merge "Do not assign InputMethod to non-input windows." into klp-dev
* commit 'e0dcb7df5206d283b29054f3e9d3da9732b27935':
  Do not assign InputMethod to non-input windows.
2013-09-17 15:18:07 -07:00
David Braun
fdacf74764 am 345d491b: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
* commit '345d491b77d70942f7a4390645fae7748b418459':
  Implement new method for handling SMS/MMS on the platform
2013-09-17 15:15:44 -07:00
Craig Mautner
e0dcb7df52 am bc65c1db: Merge "Do not assign InputMethod to non-input windows." into klp-dev
* commit 'bc65c1dbccfe936856e9a2c4066c1ec9115140e2':
  Do not assign InputMethod to non-input windows.
2013-09-17 15:15:41 -07:00
David Braun
345d491b77 Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev 2013-09-17 22:14:54 +00:00
Craig Mautner
bc65c1dbcc Merge "Do not assign InputMethod to non-input windows." into klp-dev 2013-09-17 22:13:10 +00:00
Craig Mautner
22b9a5e0aa Do not assign InputMethod to non-input windows.
The InputMethod window was being assigned to the bottommost
window as a fall-through situation when no window could receive
input. This fix changes that so that if the bottommost window
cannot receive IME input then the InputMethod will be unassigned.

In most ANRs associated with bug 10689184 mInputMethodTarget
was assigned to the Wallpaper window and the InputMethod was
placed directly above it. When the ANR occurred the window that
was awaiting focused was then always placed immediately above the
InputMethod. This fix will keep that situation from happening.

Change-Id: Ic247e8132a907f2712a9f8a89e43c099142ec851
2013-09-17 14:50:56 -07:00
Craig Mautner
8e60a4a765 am e3c9ae67: am 16efe96c: Merge "Fix parenthetical error." into klp-dev
* commit 'e3c9ae67bb2ebf3f80c23674327cde6a873c671d':
  Fix parenthetical error.
2013-09-17 13:28:20 -07:00
Craig Mautner
e3c9ae67bb am 16efe96c: Merge "Fix parenthetical error." into klp-dev
* commit '16efe96cbc570ebd2fe7e823080ba4174fbb3cbe':
  Fix parenthetical error.
2013-09-17 13:25:41 -07:00