diff options
| author | Dave Burke <daveburke@google.com> | 2012-09-17 18:58:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-17 18:58:11 -0700 |
| commit | 049dd8e6a3815519062902cc6b6f91940c54d5ea (patch) | |
| tree | fcf886d71df9fdd15c1add7f8d7f74f44bf7db3b /services | |
| parent | c535d2f30efff83b93094bbc642d59d8225dcc18 (diff) | |
| parent | ee261a5a6cd7da6d95d5c96981e0dfc068f48a05 (diff) | |
| download | frameworks_base-049dd8e6a3815519062902cc6b6f91940c54d5ea.zip frameworks_base-049dd8e6a3815519062902cc6b6f91940c54d5ea.tar.gz frameworks_base-049dd8e6a3815519062902cc6b6f91940c54d5ea.tar.bz2 | |
Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/display/WifiDisplayController.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java index 3bc19a1..87e11e6 100644 --- a/services/java/com/android/server/display/WifiDisplayController.java +++ b/services/java/com/android/server/display/WifiDisplayController.java @@ -485,8 +485,6 @@ final class WifiDisplayController implements DumpUtils.Dump { mConnectingDevice = mDesiredDevice; WifiP2pConfig config = new WifiP2pConfig(); config.deviceAddress = mConnectingDevice.deviceAddress; - // Helps with STA & P2P concurrency - config.groupOwnerIntent = WifiP2pConfig.MAX_GO_INTENT; final WifiDisplay display = createWifiDisplay(mConnectingDevice); mHandler.post(new Runnable() { |