Don't try to use Network timing with the Chromium HTTP stack

Change-Id: Ibba20a13e1389c2a7b1cc0cc45d3ef012894cb99

1 files changed, 8 insertions, 2 deletions

diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index 75ee33841203..95d927593799 100644
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -920,7 +920,10 @@ class CallbackProxy extends Handler {
         if (PERF_PROBE) {
             mWebCoreThreadTime = SystemClock.currentThreadTimeMillis();
             mWebCoreIdleTime = 0;
-            Network.getInstance(mContext).startTiming();
+            if (!JniUtil.useChromiumHttpStack()) {
+                // Network is only used with the Android HTTP stack.
+                Network.getInstance(mContext).startTiming();
+            }
             // un-comment this if PERF_PROBE is true
 //            Looper.myQueue().setWaitCallback(mIdleCallback);
         }
@@ -938,7 +941,10 @@ class CallbackProxy extends Handler {
             Log.d("WebCore", "WebCore thread used " +
                     (SystemClock.currentThreadTimeMillis() - mWebCoreThreadTime)
                     + " ms and idled " + mWebCoreIdleTime + " ms");
-            Network.getInstance(mContext).stopTiming();
+            if (!JniUtil.useChromiumHttpStack()) {
+                // Network is only used with the Android HTTP stack.
+                Network.getInstance(mContext).stopTiming();
+            }
         }
         Message msg = obtainMessage(PAGE_FINISHED, url);
         sendMessage(msg);