diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-08-29 15:22:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-29 15:22:58 -0700 |
| commit | 335e40c0f1c3aec550e61fa159130527fda597b6 (patch) | |
| tree | dda03d933558a99d58bfe5335f98e7aa2c08dc79 /wifi/java/android | |
| parent | 35c0bf31ebd2d610035fa9e27041e69c9c0cbe57 (diff) | |
| parent | f42c39b3d188ebb3ba9003cffc530717829fe874 (diff) | |
| download | frameworks_base-335e40c0f1c3aec550e61fa159130527fda597b6.zip frameworks_base-335e40c0f1c3aec550e61fa159130527fda597b6.tar.gz frameworks_base-335e40c0f1c3aec550e61fa159130527fda597b6.tar.bz2 | |
Merge "Use seperate config file for p2p"
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiNative.java | 4 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiNative.java b/wifi/java/android/net/wifi/WifiNative.java index c1f6785..8d327d0 100644 --- a/wifi/java/android/net/wifi/WifiNative.java +++ b/wifi/java/android/net/wifi/WifiNative.java @@ -60,7 +60,9 @@ public class WifiNative { public native static boolean startSupplicant(); - /* Does a graceful shutdown of supplicant. + public native static boolean startP2pSupplicant(); + + /* Does a graceful shutdown of supplicant. Is a common stop function for both p2p and sta. * * Note that underneath we use a harsh-sounding "terminate" supplicant command * for a graceful stop and a mild-sounding "stop" interface diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index adf13be..bdf0120 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -514,7 +514,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { if (DBG) Slog.w(TAG, "Unable to bring down wlan interface: " + e); } - if (WifiNative.startSupplicant()) { + if (WifiNative.startP2pSupplicant()) { mWifiMonitor.startMonitoring(); transitionTo(mP2pEnablingState); } else { |