diff options
| author | John Reck <jreck@android.com> | 2013-04-22 18:30:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-22 18:30:35 -0700 |
| commit | cfbcd00fcf6b699638f66fa74cb013c1e665c503 (patch) | |
| tree | bf9afe7135554fd4d196a7ff191c0d967ed735de /src | |
| parent | e5954cf29aec3aa71e6ab8317d5bd9a976c43a9d (diff) | |
| parent | 6fae8a98d19492a44a63bcc2ae3863f33cf1a3df (diff) | |
| download | Browser-cfbcd00fcf6b699638f66fa74cb013c1e665c503.tar.gz | |
am 6fae8a98: Merge "Fix the problem that a crash occured when user turn off data connect and download something in browser"
* commit '6fae8a98d19492a44a63bcc2ae3863f33cf1a3df':
Fix the problem that a crash occured when user turn off data connect and download something in browser
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/FetchUrlMimeType.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/browser/FetchUrlMimeType.java b/src/com/android/browser/FetchUrlMimeType.java index 33b58086..6556b380 100644 --- a/src/com/android/browser/FetchUrlMimeType.java +++ b/src/com/android/browser/FetchUrlMimeType.java @@ -107,9 +107,13 @@ class FetchUrlMimeType extends Thread { } } } catch (IllegalArgumentException ex) { - request.abort(); + if (request != null) { + request.abort(); + } } catch (IOException ex) { - request.abort(); + if (request != null) { + request.abort(); + } } finally { client.close(); } |