Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0d8afa2e: Merge "wifi: Send event without prefix to p2p0" into klp-dev

Browse Source 
* commit '0d8afa2ea314c142320bf921f81540a37561f6eb':
  wifi: Send event without prefix to p2p0
This commit is contained in:
Dmitry Shmidt
2013-08-15 12:36:43 -07:00
committed by Android Git Automerger
parent f4e2e651b3 0d8afa2ea3
commit db7f9f3842
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
wifi/java/android/net/wifi/WifiMonitor.java
View File

@@ -506,13 +506,14 @@ public class WifiMonitor {
Log.d(TAG, "Event [" + eventStr + "]");
}
String iface = "p2p0";
WifiMonitor m = null;
mStateMachine = null;
if (eventStr.startsWith("IFNAME=")) {
int space = eventStr.indexOf(' ');
if (space != -1) {
String iface = eventStr.substring(7,space);
iface = eventStr.substring(7,space);
m = mWifiMonitorSingleton.getMonitor(iface);
if (m == null && iface.startsWith("p2p-")) {
// p2p interfaces are created dynamically, but we have
@@ -520,20 +521,20 @@ public class WifiMonitor {
// for it explicitly, and send messages there ..
m = mWifiMonitorSingleton.getMonitor("p2p0");
}
if (m != null) {
if (m.mMonitoring) {
mStateMachine = m.mWifiStateMachine;
eventStr = eventStr.substring(space + 1);
}
else {
if (DBG) Log.d(TAG, "Dropping event because monitor (" + iface +
") is stopped");
continue;
}
}
else {
eventStr = eventStr.substring(space + 1);
}
eventStr = eventStr.substring(space + 1);
}
} else {
// events without prefix belong to p2p0 monitor
m = mWifiMonitorSingleton.getMonitor("p2p0");
}
if (m != null) {
if (m.mMonitoring) {
mStateMachine = m.mWifiStateMachine;
} else {
if (DBG) Log.d(TAG, "Dropping event because monitor (" + iface +
") is stopped");
continue;
}
}