diff options
| author | Patrick Scott <phanna@android.com> | 2009-04-29 13:43:13 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-29 13:43:13 -0700 |
| commit | 272cb0b86b6a57d8870533f0104a9a8c3f782997 (patch) | |
| tree | 018b1bcdb9d5c33fa02fbdf1d15f60fe79f42cb6 /src/com/android/browser/TabControl.java | |
| parent | eff59c63e8f3400944316297369c75cfebe60513 (diff) | |
| parent | 20abe047a9f424a916e1b2a5d8b614b9b466e924 (diff) | |
| download | packages_apps_Browser-272cb0b86b6a57d8870533f0104a9a8c3f782997.zip packages_apps_Browser-272cb0b86b6a57d8870533f0104a9a8c3f782997.tar.gz packages_apps_Browser-272cb0b86b6a57d8870533f0104a9a8c3f782997.tar.bz2 | |
am 20abe04: Check for null before accessing mPickerData.
Merge commit '20abe047a9f424a916e1b2a5d8b614b9b466e924'
* commit '20abe047a9f424a916e1b2a5d8b614b9b466e924':
Check for null before accessing mPickerData.
Diffstat (limited to 'src/com/android/browser/TabControl.java')
| -rw-r--r-- | src/com/android/browser/TabControl.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java index 3730ce1..9de0198 100644 --- a/src/com/android/browser/TabControl.java +++ b/src/com/android/browser/TabControl.java @@ -249,7 +249,10 @@ class TabControl { * @return The WebView's url or null. */ public String getUrl() { - return mPickerData.mUrl; + if (mPickerData != null) { + return mPickerData.mUrl; + } + return null; } /** @@ -260,7 +263,10 @@ class TabControl { * @return The WebView's title (or url) or null. */ public String getTitle() { - return mPickerData.mTitle; + if (mPickerData != null) { + return mPickerData.mTitle; + } + return null; } /** |