am c34f2f15: Merge "Add logging to help debug this issue." into mnc-dev

* commit 'c34f2f15df2030bc8c4865210da3bcbba46116bb':
  Add logging to help debug this issue.

core/java/android/net/NetworkFactory.java

@@ -25,8 +25,12 @@ import android.util.Log;
 import android.util.SparseArray;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.internal.util.Protocol;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+
 /**
  * A NetworkFactory is an entity that creates NetworkAgent objects.
  * The bearers register with ConnectivityService using {@link #register} and
@@ -158,6 +162,11 @@ public class NetworkFactory extends Handler {
             this.score = score;
             this.requested = false;
         }
+
+        @Override
+        public String toString() {
+            return "{" + request + ", score=" + score + ", requested=" + requested + "}";
+        }
     }
 
     private void handleAddRequest(NetworkRequest request, int score) {
@@ -283,11 +292,22 @@ public class NetworkFactory extends Handler {
         Log.d(LOG_TAG, s);
     }
 
+    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        final IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");
+        pw.println(toString());
+        pw.increaseIndent();
+        for (int i = 0; i < mNetworkRequests.size(); i++) {
+            pw.println(mNetworkRequests.valueAt(i));
+        }
+        pw.decreaseIndent();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("{").append(LOG_TAG).append(" - ScoreFilter=").
                 append(mScore).append(", Filter=").append(mCapabilityFilter).append(", requests=").
-                append(mNetworkRequests.size()).append("}");
+                append(mNetworkRequests.size()).append(", refCount=").append(mRefCount).
+                append("}");
         return sb.toString();
     }
 }