summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/DownloadSettings.java
diff options
context:
space:
mode:
authorAxesh R. Ajmera <aajmera@codeaurora.org>2014-04-02 14:39:09 -0700
committerAxesh R. Ajmera <aajmera@codeaurora.org>2014-04-02 14:40:19 -0700
commit7725898933bed383a5e004ed55c9d0434f7933e2 (patch)
tree0d98fbc00aa28618826d7e81be6d24e8f0d43eb2 /src/com/android/browser/DownloadSettings.java
parent7cfd7a7386a2fb315f5ec59af679e07ede49bc88 (diff)
downloadandroid_packages_apps_Gello-7725898933bed383a5e004ed55c9d0434f7933e2.tar.gz
android_packages_apps_Gello-7725898933bed383a5e004ed55c9d0434f7933e2.tar.bz2
android_packages_apps_Gello-7725898933bed383a5e004ed55c9d0434f7933e2.zip
Added null condition check for mimetype
Change-Id: Ibddc9fec4618fd59c438a9f76df83aadae44f6d6
Diffstat (limited to 'src/com/android/browser/DownloadSettings.java')
-rw-r--r--src/com/android/browser/DownloadSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index d9534e20..4ae00e3f 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -136,7 +136,7 @@ public class DownloadSettings extends Activity {
}
//Add special check for .apk files with octet-stream mimetype
- if (mimetype.equals(OCTET_STREAM) && filenameExtension.equals(APK_TYPE)) {
+ if (filenameExtension.equals(APK_TYPE) && mimetype != null && mimetype.equals(OCTET_STREAM)) {
mimetype = "application/vnd.android.package-archive";
}