commit 749e6bc5cc429b4db2353c264413f229f2694aa6
author Robert Greenwalt <rgreenwalt@google.com> Mon Sep 20 21:31:29 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 20 21:31:29 2010 -0700
tree 94c8bec6ee4daf595e5fcefd60c66abf23edc83f
parent d23329df879993c71d9ba2d1e695f2dca8ef571c
parent 313af5a3b5ba51eb75dea35eb568c841aa4beb6a

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

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

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 715b7e7..c2b11f2 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -49,6 +49,7 @@
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.GregorianCalendar;
 import java.util.List;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -112,6 +113,10 @@
     private boolean mSystemReady;
     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 {
         /**
          * Class for holding settings read from resources.
@@ -332,6 +337,9 @@
                                   mTethering.getTetherableWifiRegexs().length != 0) &&
                                  mTethering.getUpstreamIfaceRegexs().length != 0);
 
+        if (DBG) {
+            mInetLog = new ArrayList();
+        }
     }
 
 
@@ -1396,6 +1404,14 @@
         pw.println();
 
         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.
@@ -1644,6 +1660,17 @@
                 android.Manifest.permission.STATUS_BAR,
                 "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(
             NetworkStateTracker.EVENT_INET_CONDITION_CHANGE, networkType, percentage));
     }