diff options
| author | Patrick Scott <phanna@android.com> | 2009-07-15 08:04:48 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-07-15 11:58:43 -0400 |
| commit | e8dc977d91b95b3b3f56ffdadebeba4a04001200 (patch) | |
| tree | c82bbd74ac1cde7f7fdeab6fa8e8c10ccb61c8f9 /src/com/android | |
| parent | 8e5d209b650acccb72ff906d107726a35c7cf9f4 (diff) | |
| download | packages_apps_Browser-e8dc977d91b95b3b3f56ffdadebeba4a04001200.zip packages_apps_Browser-e8dc977d91b95b3b3f56ffdadebeba4a04001200.tar.gz packages_apps_Browser-e8dc977d91b95b3b3f56ffdadebeba4a04001200.tar.bz2 | |
Do not merge.
Check for a null tab in onDestroy. This fix is in master but the crash appears
in donut as well.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index e9ce8d5..f9c4dc9 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1195,8 +1195,10 @@ public class BrowserActivity extends Activity super.onDestroy(); // Remove the current tab and sub window TabControl.Tab t = mTabControl.getCurrentTab(); - dismissSubWindow(t); - removeTabFromContentView(t); + if (t != null) { + dismissSubWindow(t); + removeTabFromContentView(t); + } // Destroy all the tabs mTabControl.destroy(); WebIconDatabase.getInstance().close(); |