summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2011-01-26 23:47:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 23:47:17 -0800
commit541c252a15ed47e838875061ff33f15276eee9bb (patch)
treefb04e8560de5021bb646b9cd6f543951066eeec8 /src/com
parent74ecd30462f18f74b6310aba06f8d903b374be48 (diff)
parentd47f37112d4d0a95cd78e6ec3e14cbbb362b1595 (diff)
downloadandroid_packages_providers_DownloadProvider-541c252a15ed47e838875061ff33f15276eee9bb.tar.gz
android_packages_providers_DownloadProvider-541c252a15ed47e838875061ff33f15276eee9bb.tar.bz2
android_packages_providers_DownloadProvider-541c252a15ed47e838875061ff33f15276eee9bb.zip
am d47f3711: am 3ea897d9: Merge "bug:3396889 (HC branch) fix STOPSHIP code" into honeycomb
* commit 'd47f37112d4d0a95cd78e6ec3e14cbbb362b1595': bug:3396889 (HC branch) fix STOPSHIP code
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/providers/downloads/Constants.java4
-rw-r--r--src/com/android/providers/downloads/DownloadThread.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/Constants.java b/src/com/android/providers/downloads/Constants.java
index 6419a5e6..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 before shipping
+ 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 before shipping
+ 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 76a5c386..960765dd 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -897,11 +897,10 @@ public class DownloadThread extends Thread {
} else {
values.put(Constants.FAILED_CONNECTIONS, mInfo.mNumFailed + 1);
}
- // STOPSHIP begin delete the following lines
+ // save the error message. could be useful to developers.
if (!TextUtils.isEmpty(errorMsg)) {
values.put(Downloads.Impl.COLUMN_ERROR_MSG, errorMsg);
}
- // STOPSHIP end
mContext.getContentResolver().update(mInfo.getAllDownloadsUri(), values, null, null);
}