commit 6fae8a98d19492a44a63bcc2ae3863f33cf1a3df
author John Reck <jreck@android.com> Tue Apr 23 00:38:44 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 23 00:38:44 2013 +0000
tree ccd398723261c6fe21702d0d46131a72508d96c2
parent 4d0bc1588f40efe5e2a3fa463c4820e0978a99c0
parent 874c3b987da90a27bdfd81e64c3b5f68e1ca98d9

Merge "Fix the problem that a crash occured when user turn off data connect and download something in browser"

src/com/android/browser/FetchUrlMimeType.java

diff --git a/src/com/android/browser/FetchUrlMimeType.java b/src/com/android/browser/FetchUrlMimeType.java
index 33b5808..6556b38 100644
--- a/src/com/android/browser/FetchUrlMimeType.java
+++ b/src/com/android/browser/FetchUrlMimeType.java
@@ -107,9 +107,13 @@
                 }
             }
         } catch (IllegalArgumentException ex) {
-            request.abort();
+            if (request != null) {
+                request.abort();
+            }
         } catch (IOException ex) {
-            request.abort();
+            if (request != null) {
+                request.abort();
+            }
         } finally {
             client.close();
         }