13364 Commits

Author SHA1 Message Date
Craig Mautner
211aa32fdb am bf98c0cc: am c0eb7e7b: am 20409674: Merge "If home activity is not fullscreen keep drilling." into klp-dev
* commit 'bf98c0ccd9cab77ec06f7553c6bae317afcd6077':
  If home activity is not fullscreen keep drilling.
2013-11-07 15:13:27 -08:00
Robert Greenwalt
d528d48e5d resolved conflicts for merge of c3eef190 to master
Change-Id: I36fd3c7fcbb13e47e27ffc340484c03b5a553bb1
2013-11-07 15:05:26 -08:00
Ashish Sharma
a5043fb463 Merge "Fix the race condition for b/11458382" 2013-11-07 21:00:20 +00:00
Craig Mautner
25f6d3e6e0 am f7dea15b: am c9ffd746: Merge "Don\'t call setTask twice." into klp-dev
* commit 'f7dea15b8275dd012b1b00b9d781711eff82105a':
  Don't call setTask twice.
2013-11-07 12:58:20 -08:00
Craig Mautner
bf98c0ccd9 am c0eb7e7b: am 20409674: Merge "If home activity is not fullscreen keep drilling." into klp-dev
* commit 'c0eb7e7b545822dfb3cd43175886f2c97069e122':
  If home activity is not fullscreen keep drilling.
2013-11-07 12:53:37 -08:00
Craig Mautner
c9ffd74659 Merge "Don't call setTask twice." into klp-dev 2013-11-07 20:51:30 +00:00
Craig Mautner
2040967478 Merge "If home activity is not fullscreen keep drilling." into klp-dev 2013-11-07 20:49:02 +00:00
Craig Mautner
f41bcd47ea If home activity is not fullscreen keep drilling.
When the home activity launches a non-fullscreen activity as part of
its own task then ensureActivitiesVisibleLocked() must continue past
the launched activity when determining activities to show and hide.
Stopping at the non-fullscreen activity leaves the fullscreen home
activity hidden.

Fixes bug 11555762.

Change-Id: I9058d8cde3a41cb7f9b1f97e5c0cb32e9b0f5af7
2013-11-07 11:51:29 -08:00
Robert Greenwalt
c3eef19047 am f1612bcf: am e8c51298: Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev
* commit 'f1612bcfdd2cb517948f14369fd0977ceb55d19c':
  Add BatteryStats for Wifi Batched Scanning.
2013-11-07 10:39:43 -08:00
Robert Greenwalt
e8c51298a4 Merge "Add BatteryStats for Wifi Batched Scanning." into klp-dev 2013-11-07 18:30:49 +00:00
Dianne Hackborn
c0b5351555 am 03be79b3: am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev
* commit '03be79b35ca7060f383075a43ff19c8a9d63a7c0':
  Fix issue #11223338: Not retaining service started state while restarting
2013-11-07 10:24:22 -08:00
Dianne Hackborn
03be79b35c am fbf4888d: am 9882d388: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev
* commit 'fbf4888d19b0c68d8004f9ad2423a583dc01178e':
  Fix issue #11223338: Not retaining service started state while restarting
2013-11-07 10:21:34 -08:00
Dianne Hackborn
9882d38899 Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev 2013-11-07 18:16:10 +00:00
Craig Mautner
329f4129a5 Don't call setTask twice.
The method ActivityRecord.setTask() removes the ActivityRecord from
its old task's mActivities ArrayList. In jb-mr2 it did not have this
side effect (there was no mActivities) so calling it twice was not a
problem. This fix causes setTask to only be called once for the target
activity.

Fixes bug 11557835.

Change-Id: If2b6d4b297e86130009713efe6891a24fad3dd15
2013-11-07 09:10:42 -08:00
Jeff Brown
69b07161be Add media router service and integrate with remote displays.
This change adds a new media router service whose purpose is to track
global state information associated with media routes.  This service
publishes routes to the media router instance in application processes
and handles requested state changes such as selecting or unselecting
global routes.  The service also binds to remote display provider
services which can offer new remote display routes to the system.

Includes a test application for manually verifying certain aspects
of the operation of the media router service.

The remote display provider interface is essentially a stripped down
media route provider interface as defined in the support library
media router implementation.  For now, it is designed to be used only
by first parties to publish remote display routes to the system so
it is not exposed as public API in the SDK.  In the future, the remote
display provider interface will most likely be deprecated and replaced
with a more featureful media route provider interface for third
party integration, similar to what is in the support library today.

Further patch sets integrate these new capabilities into the System UI
and Settings for connecting remote displays.

Bug: 11257292
Change-Id: I31109f23f17b474d17534d0f5f4503e388b081c2
2013-11-07 03:25:37 -08:00
Robert Greenwalt
a029ea1318 Add BatteryStats for Wifi Batched Scanning.
bug:10690989
Change-Id: Ia39b715ee6d5733970095bc76de0ed40ff8208c0
2013-11-06 17:43:18 -08:00
Christopher Tate
4220ed7ed7 am 90be7345: am aa719e92: am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev
* commit '90be73457e0a5e526db99dc6c9d35798d87067ca':
  System package permission decls take precedence over 3rd party apps'
2013-11-06 17:01:38 -08:00
Christopher Tate
90be73457e am aa719e92: am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev
* commit 'aa719e92ffc2193db68c86b97fce291c27d5d4dd':
  System package permission decls take precedence over 3rd party apps'
2013-11-06 16:59:18 -08:00
Christopher Tate
c157cac9b2 Merge "System package permission decls take precedence over 3rd party apps'" into klp-dev 2013-11-07 00:54:55 +00:00
Dianne Hackborn
daa0d5c929 Fix issue #11223338: Not retaining service started state while restarting
When I cleaned up how we maintained the lifecycle of the tracker with a
service, I broke most tracking of the service restart state.  (Since at
that point the service is no longer associated with a process, so I
must clean up the tracker state).  This change introduces a new special
case for interacting with a service tracker to explicitly tell it when
a service is being restarted.  It also fixes how we update the process
state when services are attached to it, so it goes in and out of the
restarting state correctly.

In addition:

- Maybe fix issue #11224000 (APR: Dependent processes not getting added
  to LRU list).  We were not clearing ServiceRecord.app when bringing
  down a service, so if for some reason there were still connections to
  it at that point (which could happen for example for non-create bindings),
  then we would so it when updating the LRU state of that client process.
- dumpsys procstats's package argument can now be a package or process
  name, and we will dump all relevent information we can find about that
  name.
- Generally improved the quality of the dumpsys procstats output with its
  various options.
- Fixed a bug in ActivityManager.dumpPackageState() where it would hang if
  the service was dumping too much, added meminfo to the set of things
  dumped, and tweaked command line options to include more data.
- Added some more cleaning code to ActiveServices.killServices() to make
  sure we clean out any restarting ServiceRecord entries when a process is
  being force stopped.
- Re-arranged ActiveServices.killServices() to do the main killing of the
  service first, to avoid some wtf() calls that could happen when removing
  connections.

Bug: 11223338
Bug: 11224000

Change-Id: I5db28561c2c78aa43561e52256ff92c02311c56f
2013-11-06 16:42:17 -08:00
Craig Mautner
df220c5c59 am e5bdd85a: am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev
* commit 'e5bdd85a99839e1d557c924d5396d510151da42e':
  Tweak test for layout.
2013-11-06 15:33:35 -08:00
Craig Mautner
e5bdd85a99 am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev
* commit 'ea18624ae557a06e49748964f951a81fd6c48370':
  Tweak test for layout.
2013-11-06 15:30:23 -08:00
Craig Mautner
c9d0ee5e84 Merge "Tweak test for layout." into klp-dev 2013-11-06 23:22:12 +00:00
Craig Mautner
f961b3c5b6 Tweak test for layout.
Return to old way of only laying out Keyguard on configuration change
and add a new qualifier that does a layout if a window is part of an
opening app. This qualifier allows apps that handle their own
configuration changes to be notified of screen changes after the
configuration has changed. Apps that do not handle their own
configuration changes find their way into this code because their
surfaces are recreated by default and mHaveFrame is false.

This fixes bug 11544694 and passes the test of all bugs listed in CL
ag/383579.

Change-Id: I3a679b27eb4a2c5210957bcd4ae2f10b46f6e076
2013-11-06 14:52:36 -08:00
Craig Mautner
8da77784a0 am f6744886: am b9132543: am a724d865: Merge "Fix incorrect looping limits." into klp-dev
* commit 'f6744886f2dba3865beb2b3dff33d7bf747fe772':
  Fix incorrect looping limits.
2013-11-06 14:28:23 -08:00
Craig Mautner
f6744886f2 am b9132543: am a724d865: Merge "Fix incorrect looping limits." into klp-dev
* commit 'b9132543b02e76e7ca8f043ed68667a189b64cc0':
  Fix incorrect looping limits.
2013-11-06 14:25:32 -08:00
Craig Mautner
a724d86537 Merge "Fix incorrect looping limits." into klp-dev 2013-11-06 22:20:25 +00:00
Craig Mautner
db5c4fb864 Fix incorrect looping limits.
One cannot iterate across an entire list if one both removes an entry
and increments the index into the list. Do one or the other or you
will end up with bugs like 11556768 which is now fixed.

Change-Id: I57f1ad13075a005cae3c1cbfae10e230d9af143a
2013-11-06 13:55:08 -08:00
Michael Wright
a1dc9fc9d5 am 09bfaa79: am ce89135a: am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev
* commit '09bfaa7991066703d1dca87b4ab8e68a30076990':
  Continue synthesizing data even after brightness adjustment
2013-11-06 12:39:30 -08:00
Michael Wright
09bfaa7991 am ce89135a: am 6a29778e: Merge "Continue synthesizing data even after brightness adjustment" into klp-dev
* commit 'ce89135a53b1f5c0e7f34dbae12794f4421d9390':
  Continue synthesizing data even after brightness adjustment
2013-11-06 12:36:41 -08:00
Michael Wright
6a29778eeb Merge "Continue synthesizing data even after brightness adjustment" into klp-dev 2013-11-06 20:33:08 +00:00
Christopher Tate
3aeea1f25a System package permission decls take precedence over 3rd party apps'
In particular, if a 3rd party app tries to define a permission that
turns out to be defined by system packages following an upgrade,
the system package gets ownership and grants are re-evaluated
on that basis.

Bug 11242510

Change-Id: Id3a2b53d52750c629414cd8226e33e5e03dd0c54
2013-11-05 16:27:07 -08:00
Michael Wright
65031a2913 Continue synthesizing data even after brightness adjustment
Bug: 11337887
Change-Id: I80adb330c4e9250965030626634002a1b9c999cf
2013-11-05 15:49:52 -08:00
Craig Mautner
938b772db6 Merge "Add logging for b10858941." 2013-11-05 22:40:54 +00:00
Craig Mautner
02d3c985f3 Add logging for b10858941.
Change-Id: I0af823f32aaa48db6f39ccc04311073cde7aae9c
2013-11-05 14:37:14 -08:00
Christopher Tate
bac44cece2 am 681e0150: am 0505ebbc: am 8869d6f3: Merge "Extend preferred-app preload support for complex resolutions" into klp-dev
* commit '681e015061f0c153c9e886ca2181deea0a0ecee8':
  Extend preferred-app preload support for complex resolutions
2013-11-05 14:23:48 -08:00
Dianne Hackborn
e33d97401d am 0a3a387a: am 6d61faad: am d64744cc: Merge "Help out with issue #11497149: Clock app crashes when opened during..." into klp-dev
* commit '0a3a387a46720cdbd4fcccbe55ac24d1f385fece':
  Help out with issue #11497149: Clock app crashes when opened during...
2013-11-05 14:23:44 -08:00
Craig Mautner
dfb705a5f2 am 883327d8: am efc9acf5: am 2722d79f: Merge "Remove harmful visibility test." into klp-dev
* commit '883327d862e9383dee8b790c01c9c64fb96f65e7':
  Remove harmful visibility test.
2013-11-05 14:22:52 -08:00
John Spurlock
b26ce9cd9c am 194ff90c: am 802e04c1: am a89727c8: Merge "Ensure wallpaper hint is at least the display\'s max size." into klp-dev
* commit '194ff90c2b8c1271cf21d9183c5da78757b4416c':
  Ensure wallpaper hint is at least the display's max size.
2013-11-05 14:22:48 -08:00
Christopher Tate
681e015061 am 0505ebbc: am 8869d6f3: Merge "Extend preferred-app preload support for complex resolutions" into klp-dev
* commit '0505ebbcbe539820d434b924a76e8b9932f8862e':
  Extend preferred-app preload support for complex resolutions
2013-11-05 13:56:38 -08:00
Dianne Hackborn
0a3a387a46 am 6d61faad: am d64744cc: Merge "Help out with issue #11497149: Clock app crashes when opened during..." into klp-dev
* commit '6d61faad436f3bae41c6008ffe3e03a19eb4c277':
  Help out with issue #11497149: Clock app crashes when opened during...
2013-11-05 13:56:23 -08:00
Craig Mautner
883327d862 am efc9acf5: am 2722d79f: Merge "Remove harmful visibility test." into klp-dev
* commit 'efc9acf5a64558889740d0c717d40f830254245e':
  Remove harmful visibility test.
2013-11-05 13:26:56 -08:00
John Spurlock
194ff90c2b am 802e04c1: am a89727c8: Merge "Ensure wallpaper hint is at least the display\'s max size." into klp-dev
* commit '802e04c13f844b5ad1a257cc9f3808a0b78ceaba':
  Ensure wallpaper hint is at least the display's max size.
2013-11-05 13:26:53 -08:00
Christopher Tate
8869d6f353 Merge "Extend preferred-app preload support for complex resolutions" into klp-dev 2013-11-05 18:42:58 +00:00
Dianne Hackborn
d64744cc76 Merge "Help out with issue #11497149: Clock app crashes when opened during..." into klp-dev 2013-11-05 18:17:01 +00:00
Craig Mautner
2722d79f01 Merge "Remove harmful visibility test." into klp-dev 2013-11-05 15:45:10 +00:00
John Spurlock
a89727c85e Merge "Ensure wallpaper hint is at least the display's max size." into klp-dev 2013-11-05 14:05:06 +00:00
Craig Mautner
57c3aa090c am 949f18eb: am 76203db2: am 351de3cc: Merge "Layout hidden windows on Configuration change." into klp-dev
* commit '949f18eb79f33c53a5832cd1b28b23799a4ea452':
  Layout hidden windows on Configuration change.
2013-11-04 22:00:03 -08:00
Dianne Hackborn
22c746efbc am c5db266a: am f355f978: am efcc2ca6: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev
* commit 'c5db266a247f625b946df5d78e3b89a0fdb1516f':
  Fix issue #11223338: Not retaining service started state while restarting
2013-11-04 21:59:27 -08:00
Brian Carlstrom
6a429f5604 am 94edb339: am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
* commit '94edb3390970c302be926b42e0f8a8da0d5d5960':
  Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-04 21:59:23 -08:00