am 32d9917c: am 7666801a: Merge "bug:4121206 handle STOPSHIP comments/code" into honeycomb-mr1

* commit '32d9917cd4f56cabcbafa645c8cd89cd832ac523':
  bug:4121206 handle STOPSHIP comments/code

2 files changed, 2 insertions, 4 deletions

diff --git a/src/com/android/providers/downloads/Constants.java b/src/com/android/providers/downloads/Constants.java
index acf9732a..ef0c6dbb 100644
--- a/src/com/android/providers/downloads/Constants.java
+++ b/src/com/android/providers/downloads/Constants.java
@@ -144,10 +144,10 @@ public class Constants {
     static final boolean LOGX = false;
 
     /** Enable verbose logging - use with "setprop log.tag.DownloadManager VERBOSE" */
-    private static final boolean LOCAL_LOGV = true; // STOPSHIP change this to false
+    private static final boolean LOCAL_LOGV = false;
     public static final boolean LOGV = LOCAL_LOGV && Log.isLoggable(TAG, Log.VERBOSE);
 
     /** Enable super-verbose logging */
-    private static final boolean LOCAL_LOGVV = true; // STOPSHIP change this to false
+    private static final boolean LOCAL_LOGVV = false;
     public static final boolean LOGVV = LOCAL_LOGVV && LOGV;
 }
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 77f7fa1f..fbd3b82c 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -660,13 +660,11 @@ public class DownloadThread extends Thread {
      */
     private void handleOtherStatus(State state, InnerState innerState, int statusCode)
             throws StopRequestException {
-        // STOPSHIP remove this. should help in debugging http://b/issue?id=3422868
         if (statusCode == 416) {
             // range request failed. it should never fail.
             throw new IllegalStateException("Http Range request failure: totalBytes = " +
                     innerState.mTotalBytes + ", bytes recvd so far: " + innerState.mBytesSoFar);
         }
-        // END STOPSHIP
         int finalStatus;
         if (Downloads.Impl.isStatusError(statusCode)) {
             finalStatus = statusCode;