Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbabe143 authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

wifi: Send event without prefix to p2p0 



Bug: 9298955

Change-Id: I71037dd1cd60ee4efa75e1d6fab60a07bdf0626d
Signed-off-by: default avatarDmitry Shmidt <dimitrysh@google.com>
parent 80f7ec06

wifi/java/android/net/wifi/WifiMonitor.java

+16 −15
Original line number Diff line number Diff line
@@ -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,22 +521,22 @@ public class WifiMonitor { 
                            // for it explicitly, and send messages there ..

                            m = mWifiMonitorSingleton.getMonitor("p2p0");

                        }

                        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;

                                eventStr = eventStr.substring(space + 1);

                            }

                            else {

                    } else {

                        if (DBG) Log.d(TAG, "Dropping event because monitor (" + iface +

                                            ") is stopped");

                        continue;

                    }

                }

                        else {

                            eventStr = eventStr.substring(space + 1);

                        }

                    }

                }



                if (mStateMachine != null) {

                    if (dispatchEvent(eventStr)) {