commit 7725898933bed383a5e004ed55c9d0434f7933e2
author Axesh  R. Ajmera <aajmera@codeaurora.org> Wed Apr 02 14:39:09 2014 -0700
committer Axesh  R. Ajmera <aajmera@codeaurora.org> Wed Apr 02 14:40:19 2014 -0700
tree 0d98fbc00aa28618826d7e81be6d24e8f0d43eb2
parent 7cfd7a7386a2fb315f5ec59af679e07ede49bc88

Added null condition check for mimetype

Change-Id: Ibddc9fec4618fd59c438a9f76df83aadae44f6d6

src/com/android/browser/DownloadSettings.java

diff --git a/src/com/android/browser/DownloadSettings.java b/src/com/android/browser/DownloadSettings.java
index d9534e2..4ae00e3 100644
--- a/src/com/android/browser/DownloadSettings.java
+++ b/src/com/android/browser/DownloadSettings.java
@@ -136,7 +136,7 @@
         }
 
         //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";
         }