Add a bit more logging to track down network state issues.

BUG=2055624

diff --git a/src/com/android/providers/downloads/DownloadReceiver.java b/src/com/android/providers/downloads/DownloadReceiver.java
index 74f2931..eeb1fda 100644 (file)
--- a/src/com/android/providers/downloads/DownloadReceiver.java
+++ b/src/com/android/providers/downloads/DownloadReceiver.java
@@ -52,12 +52,20 @@ public class DownloadReceiver extends BroadcastReceiver {
                     intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);
             if (info != null && info.isConnected()) {
                 if (Constants.LOGX) {
-                    Log.i(Constants.TAG, "Broadcast: Network Up");
+                    if (Helpers.isNetworkAvailable(context)) {
+                        Log.i(Constants.TAG, "Broadcast: Network Up");
+                    } else {
+                        Log.i(Constants.TAG, "Broadcast: Network Up, Actually Down");
+                    }
                 }
                 context.startService(new Intent(context, DownloadService.class));
             } else {
                 if (Constants.LOGX) {
-                    Log.i(Constants.TAG, "Broadcast: Network Down");
+                    if (Helpers.isNetworkAvailable(context)) {
+                        Log.i(Constants.TAG, "Broadcast: Network Down, Actually Up");
+                    } else {
+                        Log.i(Constants.TAG, "Broadcast: Network Down");
+                    }
                 }
             }
         } else if (intent.getAction().equals(Constants.ACTION_RETRY)) {
@@ -65,7 +73,11 @@ public class DownloadReceiver extends BroadcastReceiver {
                 Log.v(Constants.TAG, "Receiver retry");
             }
             if (Constants.LOGX) {
-                Log.i(Constants.TAG, "Broadcast: Timed Retry");
+                if (Helpers.isNetworkAvailable(context)) {
+                    Log.i(Constants.TAG, "Broadcast: Timed Retry, Net Up");
+                } else {
+                    Log.i(Constants.TAG, "Broadcast: Timed Retry, Net Down");
+                }
             }
             context.startService(new Intent(context, DownloadService.class));
         } else if (intent.getAction().equals(Constants.ACTION_OPEN)

diff --git a/src/com/android/providers/downloads/DownloadService.java b/src/com/android/providers/downloads/DownloadService.java
index 07ab941..3824fc2 100644 (file)
--- a/src/com/android/providers/downloads/DownloadService.java
+++ b/src/com/android/providers/downloads/DownloadService.java
@@ -287,6 +287,13 @@ public class DownloadService extends Service {
                                 if (Constants.LOGV) {
                                     Log.v(Constants.TAG, "scheduling retry in " + wakeUp + "ms");
                                 }
+                                if (Constants.LOGX) {
+                                    if (Helpers.isNetworkAvailable(DownloadService.this)) {
+                                        Log.i(Constants.TAG, "Alarm in " + wakeUp + "ms, Net Up");
+                                    } else {
+                                        Log.i(Constants.TAG, "Alarm in " + wakeUp + "ms, Net Down");
+                                    }
+                                }
                                 Intent intent = new Intent(Constants.ACTION_RETRY);
                                 intent.setClassName("com.android.providers.downloads",
                                         DownloadReceiver.class.getName());
@@ -661,6 +668,13 @@ public class DownloadService extends Service {
                             ContentUris.withAppendedId(Downloads.CONTENT_URI, info.mId),
                             values, null, null);
                 }
+                if (Constants.LOGX) {
+                    if (Helpers.isNetworkAvailable(DownloadService.this)) {
+                        Log.i(Constants.TAG, "Thread for " + info.mId + ", Net Up");
+                    } else {
+                        Log.i(Constants.TAG, "Thread for " + info.mId + ", Net Down");
+                    }
+                }
                 DownloadThread downloader = new DownloadThread(this, info);
                 info.mHasActiveThread = true;
                 downloader.start();
@@ -748,6 +762,13 @@ public class DownloadService extends Service {
                 getContentResolver().update(
                         ContentUris.withAppendedId(Downloads.CONTENT_URI, info.mId),
                         values, null, null);
+                if (Constants.LOGX) {
+                    if (Helpers.isNetworkAvailable(DownloadService.this)) {
+                        Log.i(Constants.TAG, "Thread for " + info.mId + ", Net Up");
+                    } else {
+                        Log.i(Constants.TAG, "Thread for " + info.mId + ", Net Down");
+                    }
+                }
                 DownloadThread downloader = new DownloadThread(this, info);
                 info.mHasActiveThread = true;
                 downloader.start();

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index cee34cf..ac115e5 100644 (file)
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -203,9 +203,9 @@ http_request_loop:
                 try {
                     if (Constants.LOGX) {
                         if (Helpers.isNetworkAvailable(mContext)) {
-                            Log.i(Constants.TAG, "Starting, Net Up");
+                            Log.i(Constants.TAG, "Starting " + mInfo.mId + ", Net Up");
                         } else {
-                            Log.i(Constants.TAG, "Starting, Net Down");
+                            Log.i(Constants.TAG, "Starting " + mInfo.mId + ", Net Down");
                         }
                     }
                     response = client.execute(request);
@@ -223,9 +223,9 @@ http_request_loop:
                 } catch (IOException ex) {
                     if (Constants.LOGX) {
                         if (Helpers.isNetworkAvailable(mContext)) {
-                            Log.i(Constants.TAG, "Execute Failed, Net Up");
+                            Log.i(Constants.TAG, "Execute Failed " + mInfo.mId + ", Net Up");
                         } else {
-                            Log.i(Constants.TAG, "Execute Failed, Net Down");
+                            Log.i(Constants.TAG, "Execute Failed " + mInfo.mId + ", Net Down");
                         }
                     }
                     if (!Helpers.isNetworkAvailable(mContext)) {
@@ -458,9 +458,9 @@ http_request_loop:
                     } catch (IOException ex) {
                         if (Constants.LOGX) {
                             if (Helpers.isNetworkAvailable(mContext)) {
-                                Log.i(Constants.TAG, "GetContent Failed, Net Up");
+                                Log.i(Constants.TAG, "Get Failed " + mInfo.mId + ", Net Up");
                             } else {
-                                Log.i(Constants.TAG, "GetContent Failed, Net Down");
+                                Log.i(Constants.TAG, "Get Failed " + mInfo.mId + ", Net Down");
                             }
                         }
                         if (!Helpers.isNetworkAvailable(mContext)) {
@@ -491,9 +491,9 @@ http_request_loop:
                         } catch (IOException ex) {
                             if (Constants.LOGX) {
                                 if (Helpers.isNetworkAvailable(mContext)) {
-                                    Log.i(Constants.TAG, "Read Failed, Net Up");
+                                    Log.i(Constants.TAG, "Read Failed " + mInfo.mId + ", Net Up");
                                 } else {
-                                    Log.i(Constants.TAG, "Read Failed, Net Down");
+                                    Log.i(Constants.TAG, "Read Failed " + mInfo.mId + ", Net Down");
                                 }
                             }
                             ContentValues values = new ContentValues();
@@ -714,6 +714,13 @@ http_request_loop:
                     }
                 }
             }
+            if (Constants.LOGX) {
+                if (Helpers.isNetworkAvailable(mContext)) {
+                    Log.i(Constants.TAG, "Done " + mInfo.mId + " w/ " + finalStatus + ", Net Up");
+                } else {
+                    Log.i(Constants.TAG, "Done " + mInfo.mId + " w/ " + finalStatus + ", Net Down");
+                }
+            }
             notifyDownloadCompleted(finalStatus, countRetry, retryAfter, redirectCount,
                     gotData, filename, newUri, mimeType);
         }