diff options
| author | John Reck <jreck@google.com> | 2011-02-22 14:55:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-22 14:55:07 -0800 |
| commit | 667271dd37665a8d6d1ee430c8f2680d0f1d9c8d (patch) | |
| tree | d471ceeaf71dcd81c704f8c095fde9e6868c284c /src/com/android | |
| parent | 991bb5f8ae763265ba9ed57b0c785ecf23868d44 (diff) | |
| parent | 38b4bf5f9cbb6adf2c5ca353e3b0c2a4ae9eeb87 (diff) | |
| download | packages_apps_Browser-667271dd37665a8d6d1ee430c8f2680d0f1d9c8d.zip packages_apps_Browser-667271dd37665a8d6d1ee430c8f2680d0f1d9c8d.tar.gz packages_apps_Browser-667271dd37665a8d6d1ee430c8f2680d0f1d9c8d.tar.bz2 | |
Merge "Fix NPE in onDestroy"
Diffstat (limited to 'src/com/android')
| -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 062814b..0961f80 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; } |