LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread

Browse Source 
Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports
This commit is contained in:
Robert Greenwalt
2010-09-20 21:31:29 -07:00
committed by Android Git Automerger
parent 7d6070c3fd 0e80be1a8d
commit 2097907748
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/java/com/android/server/ConnectivityService.java
View File

@@ -49,6 +49,7 @@ import com.android.server.connectivity.Tethering;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -112,6 +113,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private boolean mSystemReady; private boolean mSystemReady;
private Intent mInitialBroadcast; private Intent mInitialBroadcast;
// used in DBG mode to track inet condition reports
private static final int INET_CONDITION_LOG_MAX_SIZE = 15;
private ArrayList mInetLog;
private static class NetworkAttributes { private static class NetworkAttributes {
/** /**
* Class for holding settings read from resources. * Class for holding settings read from resources.
@@ -332,6 +337,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mTethering.getTetherableWifiRegexs().length != 0) && mTethering.getTetherableWifiRegexs().length != 0) &&
mTethering.getUpstreamIfaceRegexs().length != 0); mTethering.getUpstreamIfaceRegexs().length != 0);
if (DBG) {
mInetLog = new ArrayList();
}
} }
@@ -1396,6 +1404,14 @@ public class ConnectivityService extends IConnectivityManager.Stub {
pw.println(); pw.println();
mTethering.dump(fd, pw, args); mTethering.dump(fd, pw, args);
if (mInetLog != null) {
pw.println();
pw.println("Inet condition reports:");
for(int i = 0; i < mInetLog.size(); i++) {
pw.println(mInetLog.get(i));
}
}
} }
// must be stateless - things change under us. // must be stateless - things change under us.
@@ -1644,6 +1660,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
android.Manifest.permission.STATUS_BAR, android.Manifest.permission.STATUS_BAR,
"ConnectivityService"); "ConnectivityService");
if (DBG) {
int pid = getCallingPid();
int uid = getCallingUid();
String s = pid + "(" + uid + ") reports inet is " +
(percentage > 50 ? "connected" : "disconnected") + " (" + percentage + ") on " +
"network Type " + networkType + " at " + GregorianCalendar.getInstance().getTime();
mInetLog.add(s);
while(mInetLog.size() > INET_CONDITION_LOG_MAX_SIZE) {
mInetLog.remove(0);
}
}
mHandler.sendMessage(mHandler.obtainMessage( mHandler.sendMessage(mHandler.obtainMessage(
NetworkStateTracker.EVENT_INET_CONDITION_CHANGE, networkType, percentage)); NetworkStateTracker.EVENT_INET_CONDITION_CHANGE, networkType, percentage));
} }