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

Commit bfadb84f authored Mar 04, 2013 by Irfan Sheriff Committed by Android Git Automerger Mar 04, 2013

am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev

* commit 'f9d3020c':
  Clean up statemachine

parents f9ed8be1 f9d3020c

wifi/java/android/net/wifi/WifiNative.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -18,14 +18,10 @@ package android.net.wifi;

		import android.net.wifi.p2p.WifiP2pConfig;
		import android.net.wifi.p2p.WifiP2pGroup;
		import android.net.wifi.p2p.WifiP2pDevice;
		import android.text.TextUtils;
		import android.net.wifi.p2p.nsd.WifiP2pServiceInfo;
		import android.net.wifi.p2p.nsd.WifiP2pServiceRequest;
		import android.util.Log;

		import java.io.InputStream;
		import java.lang.Process;
		import java.util.ArrayList;
		import java.util.List;

wifi/java/android/net/wifi/WifiStateMachine.java

+94 −434

File changed.

Preview size limit exceeded, changes collapsed.