diff options
author | Chong Zhang <chz@google.com> | 2013-05-03 15:55:36 -0700 |
---|---|---|
committer | Chong Zhang <chz@google.com> | 2013-08-23 16:02:09 -0700 |
commit | 1f3ecaae6303d5ee6c5ca8499262c9962f036365 (patch) | |
tree | 610f36b3c049710713e921c1aa10938fa250f1d2 /media | |
parent | 570cd0f4c06a6e3de2af348040415ff2fcff57a1 (diff) | |
download | frameworks_base-1f3ecaae6303d5ee6c5ca8499262c9962f036365.zip frameworks_base-1f3ecaae6303d5ee6c5ca8499262c9962f036365.tar.gz frameworks_base-1f3ecaae6303d5ee6c5ca8499262c9962f036365.tar.bz2 |
wifi-display: add certification options
When certification mode is enabled:
- Pass wfd session info to wifi display settings
- Allow sink to connect to source
- Add interface in display manager for pausing/resuming session
- Add interface in WifiP2pManager for setting lc, oc and starting
autonomous GO
Note that we're compliant regardless of certification mode, but
some confusing options (eg. allowing incoming connection from
sink) we want to hide when not being tested.
Bug: 9371882
Change-Id: Icc7dcae4e046453796cfa03f5f197055fabf234b
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/RemoteDisplay.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/media/java/android/media/RemoteDisplay.java b/media/java/android/media/RemoteDisplay.java index b463d26..7afce1a 100644 --- a/media/java/android/media/RemoteDisplay.java +++ b/media/java/android/media/RemoteDisplay.java @@ -42,6 +42,8 @@ public final class RemoteDisplay { private native int nativeListen(String iface); private native void nativeDispose(int ptr); + private native void nativePause(int ptr); + private native void nativeResume(int ptr); private RemoteDisplay(Listener listener, Handler handler) { mListener = listener; @@ -87,6 +89,14 @@ public final class RemoteDisplay { dispose(false); } + public void pause() { + nativePause(mPtr); + } + + public void resume() { + nativeResume(mPtr); + } + private void dispose(boolean finalized) { if (mPtr != 0) { if (mGuard != null) { @@ -113,11 +123,11 @@ public final class RemoteDisplay { // Called from native. private void notifyDisplayConnected(final Surface surface, - final int width, final int height, final int flags) { + final int width, final int height, final int flags, final int session) { mHandler.post(new Runnable() { @Override public void run() { - mListener.onDisplayConnected(surface, width, height, flags); + mListener.onDisplayConnected(surface, width, height, flags, session); } }); } @@ -146,7 +156,8 @@ public final class RemoteDisplay { * Listener invoked when the remote display connection changes state. */ public interface Listener { - void onDisplayConnected(Surface surface, int width, int height, int flags); + void onDisplayConnected(Surface surface, + int width, int height, int flags, int session); void onDisplayDisconnected(); void onDisplayError(int error); } |