diff options
| author | John Reck <jreck@google.com> | 2011-02-22 14:39:34 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-02-22 14:39:53 -0800 |
| commit | 38b4bf5f9cbb6adf2c5ca353e3b0c2a4ae9eeb87 (patch) | |
| tree | cb98754155c8b78c6d2f6cd5e6824feedc706731 /src/com/android/browser/Controller.java | |
| parent | a3206e2e51c41ca62da10bdbb6aa649fce522e87 (diff) | |
Fix NPE in onDestroy
Bug: 3478016
Change-Id: I0bf1819ab786a8b07575856b8cfa4d20bc074e49
Diffstat (limited to 'src/com/android/browser/Controller.java')
| -rw-r--r-- | src/com/android/browser/Controller.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 062814b1..0961f80a 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -678,7 +678,7 @@ public class Controller } void onDestroy() { - if (!mUploadHandler.handled()) { + if (mUploadHandler != null && !mUploadHandler.handled()) { mUploadHandler.onResult(Activity.RESULT_CANCELED, null); mUploadHandler = null; } |