44 Commits

Author SHA1 Message Date
Irfan Sheriff
916b2b5a93 Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 2012-09-23 17:32:07 -07:00
Irfan Sheriff
2c2ca5cb7c Increase WFD connect time out to 60s
The worst case WPS timeout for GO negotiation is two minutes.
Until, we better handle cancelling/disconnecting and re-syncing the
WFD framework with the wifi direct framework/supplicant, increase
the time out to 60s to help with dogfood

Bug: 7217600
Change-Id: I1ba0d9963b957454e2c6f47bfdf05176dea07be7
2012-09-23 17:30:19 -07:00
Jeff Brown
e87bf03076 Support HDMI hotplug.
Bug: 7206678
Change-Id: Ia5212b16658a5f5a2ccf8528eca7bebd45ca857a
2012-09-21 15:34:32 -07:00
Irfan Sheriff
957fadc500 Merge "Use min group owner intent for concurrency" into jb-mr1-dev 2012-09-20 18:05:22 -07:00
Irfan Sheriff
99766cf40e Use min group owner intent for concurrency
Our device only supports STA & GC concurrency

Change-Id: I4f16c959a6f4e7ad5610dcae67be830d741f162c
2012-09-20 17:18:20 -07:00
Jeff Brown
bbd28a293f Provide a debugging option to force enable wifi display.
Bug: 7179627
Change-Id: I84c7605a1cee5ed723341eebdcec4a824e7e4d38
2012-09-20 16:47:15 -07:00
Jeff Brown
c2b9ea6241 Make wifi display state changes more robust.
Bug: 7178216
Change-Id: Icceaeb61730b0b4916cdda44459f4c69553e303c
2012-09-19 23:15:26 -07:00
Jeff Brown
89d5546d7f Add support for remembering Wifi display devices.
Add a setting to globally disable Wifi display.

Fixed a bug where the wifi display broadcast receiver
was running on the wrong thread.

Removed the wifi-display QuickSettings dialog, all functionality
has been moved to Settings.

Bug: 7178216
Bug: 7192799
Change-Id: I9796baac8245d664cf28fa147b9ed978d81d8ab9
2012-09-19 22:04:44 -07:00
Irfan Sheriff
24ed276913 Merge "WFD fixes" into jb-mr1-dev 2012-09-18 12:22:06 -07:00
Irfan Sheriff
e0c28d5f13 WFD fixes
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast

Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
2012-09-18 12:20:37 -07:00
Dave Burke
049dd8e6a3 Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 2012-09-17 18:58:11 -07:00
Dave Burke
ee261a5a6c Revert "Specify max go intent for wifi display"
This reverts commit 7ab7260697de617aced0b0ba594304a42e5395bd

Change-Id: I5b322f41729695465b164e1dfe6d4b1902cd8117
2012-09-17 18:56:19 -07:00
Irfan Sheriff
218e2f199b Merge "Specify max go intent for wifi display" into jb-mr1-dev 2012-09-17 17:37:48 -07:00
Irfan Sheriff
7ab7260697 Specify max go intent for wifi display
For p2p and sta single channel concurrency, we need the device
to be a GO

Change-Id: I8c3f180b8fc450238e24dace478f03cdf4e370a7
2012-09-17 17:34:03 -07:00
Jeff Brown
c9bd4ca005 Swap remote submix initialization order.
Need to turn the submix on before connecting and off
after disconnecting.

Change-Id: I53389c3b61e6d663855accd0461eed42a67d9d2b
2012-09-17 12:24:43 -07:00
Jeff Brown
5380a064c3 Eat copy pasta.
Change-Id: I74cbad279c15f1999cc68d732fc04d6c448b5c39
2012-09-13 19:24:57 -07:00
Jeff Brown
cdfc56a387 Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev 2012-09-13 15:34:51 -07:00
Jeff Brown
c5df37c285 Add preliminary API for reporting display capabilities.
Change-Id: Ie18dce5b5d130f9a7cdfca08cddbf9b099312277
2012-09-13 11:45:07 -07:00
Jeff Brown
88469e56c8 Enable remote submix for wifi display.
Change-Id: Ib6cad4ecfed91abf835555a1089a206ee9b0763c
2012-09-12 16:03:11 -07:00
Jeff Brown
f8f0eddd07 Improve reporting of wifi connection state.
We should only report that the wifi display is connected
after the RTSP connection has been fully established.

Change-Id: Ifc6bc5d5cebd42d551026885b31cbc74b7ece2b1
2012-09-11 17:05:11 -07:00
Jeff Brown
59c53c6224 Don't auto-discover peers until scan requested.
Change-Id: I4ad08873567a5ac86e9bd46abd2375b183e2e95b
2012-09-11 12:21:55 -07:00
Jeff Brown
0f68d166e6 Use wfdInfo to filter available sinks.
Change-Id: If056267738f70835af645a8c6e7a91c0c5407816
2012-09-11 12:18:15 -07:00
Jeff Brown
3c5dab46a7 Merge "Make input system aware of multiple displays." into jb-mr1-dev 2012-09-10 17:07:17 -07:00
Jeff Brown
83d616a9c7 Make input system aware of multiple displays.
The input system needs to know about the window that has
focus, even if it is on a secondary display.  So now we
send it the list of all windows and indicate which display
they are on.  We filter the list of windows as necessary
when delivering touch events.

To keep things simple, monitor input channels and input
filters are not supported except on the main display.
We also do not pass the display id to applications; it is
only used inside the input system for now.

Properly scale touch coordinates based on the viewport.
This will be needed to ensure that touch works on external
display as well as when the internal display is being used
to simulate a different resolution.

Change-Id: I1815579a52fcc852c519b5391fc7ab8767c2dc59
2012-09-10 15:48:47 -07:00
Andreas Huber
5e0cc0d7ab Fix port logic in WifiDisplayController.
It's not the port advertised in the sink's wfd IE, it's the one our
source broadcasts in its wfd IE. In addition some dongles ignore the
broadcast port and have to be special cased.

Change-Id: Id5d279652e336391ba34dfc30bba700043d49b1d
2012-09-10 11:35:15 -07:00
Jeff Brown
21c7153d30 Disable wifi display API when the adapter is not registered.
Bug: 7132341
Change-Id: I46d859082077afd2c8adc829ad285977dff80d07
2012-09-09 13:28:04 -07:00
Jeff Brown
180bbc7181 Improve Wifi display discovery API.
Change-Id: I4d46503e5413f52da16f79bbc9c631cc5ae9c178
2012-09-08 23:15:00 -07:00
Jeff Brown
d728bf514f Make display manager tell input system about viewports.
The window manager is no longer responsible for telling the
input system about the display viewport.

Change-Id: I932882bae55decef55f25093bb2a7ebac1620bb1
2012-09-08 18:12:57 -07:00
Jeff Brown
e08ae388d6 Add new wifi display discovery API.
The API is quite simple.  There are a few extra functions
on DisplayManager to scan, connect and disconnect from
wifi displays and get status, and a single protected
broadcast sent when the status changes.

Change-Id: Ic91dbab5ee818e790b27fa32e1a1e93788793be0
2012-09-08 14:53:34 -07:00
Jeff Brown
0cfebf28b1 Retry wifi display connections.
Change-Id: I48c62c7e272c2696022ddeea1c3107d24a9431b8
2012-09-07 17:50:58 -07:00
Jeff Brown
4d0b562554 Disable hardcoded wifi display adapter.
Change-Id: Id0f7d59b6eafa8794ff7616cf54a0b94ba78c763
2012-09-07 17:50:56 -07:00
Craig Mautner
722285e199 Make mirroring automatic based on Windows on display.
Tell the display manager whenever a given logical display
contains interesting windows.  If so, then the display
manager arranges to show that content on a physical display,
otherwise it ignores the logical display and makes its
associated primary physical display mirror the default
display.

Assign DisplayContents when Displays are added, remove them when
Displays are removed, and update the DisplayInfo when Displays
change.

Change-Id: I36e08ec538055acabe1e24cdd12c40de4e47a158
2012-09-07 14:46:32 -07:00
Jeff Brown
cbad976b2a Add support for Wifi display.
Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
2012-09-07 13:26:31 -07:00
Mathias Agopian
63f1c43fbe update to new SurfaceComposerClient API
Change-Id: I8f2c96df56fe3a851b8ec03bb8734db0b6bea3d5
2012-09-04 20:23:23 -07:00
Jeff Brown
4ed8fe75e1 More improvements to the display manager.
Added more complete support for logical displays with
support for mirroring, rotation and scaling.

Improved the overlay display adapter's touch interactions.

A big change here is that the display manager no longer relies
on a single-threaded model to maintain its synchronization
invariants.  Unfortunately we had to change this so as to play
nice with the fact that the window manager wants to own
the surface flinger transaction around display and surface
manipulations.  As a result, the display manager has to be able
to update displays from the context of any thread.

It would be nice to make this process more cooperative.
There are already several components competing to perform
surface flinger transactions including the window manager,
display manager, electron beam, overlay display window,
and mouse pointer.  They are not manipulating the same surfaces
but they can collide with one another when they make global
changes to the displays.

Change-Id: I04f448594241f2004f6f3d1a81ccd12c566bf296
2012-08-31 15:42:46 -07:00
Jeff Brown
d0dd63dcae Tweak overlay display adapter scaling.
Change-Id: I330fc019c5b3f4e03369e6f1c1a839a33f6ce0e3
2012-08-29 18:45:32 -07:00
Jeff Brown
bd6e1500ae Add initial multi-display support.
Split the DisplayManager into two parts.  One part is bound
to a Context and takes care of Display compatibility and
caching Display objects on behalf of the Context.  The other
part is global and takes care of communicating with the
DisplayManagerService, handling callbacks, and caching
DisplayInfo objects on behalf of the process.

Implemented support for enumerating Displays and getting
callbacks when displays are added, removed or changed.

Elaborated the roles of DisplayManagerService, DisplayAdapter,
and DisplayDevice.  We now support having multiple display
adapters registered, each of which can register multiple display
devices and configure them dynamically.

Added an OverlayDisplayAdapter which is used to simulate
secondary displays by means of overlay windows.  Different
configurations of overlays can be selected using a new
setting in the Developer Settings panel.  The overlays can
be repositioned and resized by the user for convenience.

At the moment, all displays are mirrors of display 0 and
no display transformations are applied.  This will be improved
in future patches.

Refactored the way that the window manager creates its threads.
The OverlayDisplayAdapter needs to be able to use hardware
acceleration so it must share the same UI thread as the Keyguard
and window manager policy.  We now handle this explicitly as
part of starting up the system server.  This puts us in a
better position to consider how we might want to share (or not
share) Loopers among components.

Overlay displays are disabled when in safe mode or in only-core
mode to reduce the number of dependencies started in these modes.

Change-Id: Ic2a661d5448dde01b095ab150697cb6791d69bb5
2012-08-29 15:34:17 -07:00
Jeff Brown
64a55af0ac Add plumbing for new surface flinger display API.
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.

Added JNI for all of the new surface flinger display API calls.

Enforced the requirement that all Surfaces created by
the window manager be named.

Updated the display manager service to use the new methods.

Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
2012-08-27 14:34:54 -07:00
Jeff Brown
bf5740e75e Improve display manager debugging.
Change-Id: Iae794fe99a7cf9809f64eafb216091126a2f7e39
2012-08-19 23:20:02 -07:00
Jeff Brown
848c2dc93b Stub out display manager service implementation.
Reverting to the previous stub as the display adapter registration
and the logical to physical mapping is not at all what we are going
to need moving forward.

Fixed up the service initialization order so that the display manager
service has a context from the start.

Change-Id: I717f2f1099c7a77180ef207c371ec8329258850a
2012-08-19 21:21:37 -07:00
Craig Mautner
9de4936c99 Add features to DisplayManager.
Added Surface.setDisplayId().
Added callbacks to DisplayManagerService.

Change-Id: Idd3f85f8ca1f1208962f1196efd6a3ab51c8c259
2012-08-02 14:30:30 -07:00
Craig Mautner
4f67ba6ba4 Refactor DisplayManagerService to be functional.
Change-Id: Ieac1eca172be5dc5db45302d3afa26188acd4d6d
2012-08-02 11:23:00 -07:00
Dianne Hackborn
908aecc3a6 Start moving away from DisplayMetrics.DENSITY_DEVICE.
This puts in most of the infrastructure needed to allow us to
switch between different densities at run time.  The main remaining
uses of the global are to initialize the Bitmap object (not sure
what to do about that since it doesn't have anything passed in
the constructor to get this information from), and being able to
load drawables if we need a different density than what was preloaded
by zygote.

Change-Id: Ifdbfd6b7a5c59e6aa22e63b95b78d96af3d96848
2012-08-01 10:54:39 -07:00
Jeff Brown
fa25bf5382 Add display manager skeleton.
The purpose of this change is to remove direct reliance on
SurfaceFlinger for describing the size and characteristics of
displays.

This patch also starts to make a distinction between logical displays
and physical display devices.  Currently, the window manager owns
the concept of a logical display whereas the new display
manager owns the concept of a physical display device.

Change-Id: I7e0761f83f033be6c06fd1041280c21500bcabc0
2012-07-25 18:56:16 -07:00