diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 09:56:48 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-22 09:56:48 -0700 |
| commit | 6309c526e57454da6d0c5de93f2894c2ded3a1b1 (patch) | |
| tree | 4f70c394d9b6a8bd221b2c688a1a426fd823ddf7 /src/com/android/browser/BrowserActivity.java | |
| parent | 7db8fb04183016406e20a63444fe94eec29a309a (diff) | |
| parent | 73972695c844b25370ad738bb76e8eb2e9cd81e6 (diff) | |
| download | packages_apps_Browser-6309c526e57454da6d0c5de93f2894c2ded3a1b1.tar.gz packages_apps_Browser-6309c526e57454da6d0c5de93f2894c2ded3a1b1.tar.bz2 packages_apps_Browser-6309c526e57454da6d0c5de93f2894c2ded3a1b1.zip | |
am 73972695: Merge change 4925 into donut
Merge commit '73972695c844b25370ad738bb76e8eb2e9cd81e6'
* commit '73972695c844b25370ad738bb76e8eb2e9cd81e6':
Fix 2 NPEs in the Browser.
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index d1d8d15b8..ef484b091 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -2187,10 +2187,12 @@ public class BrowserActivity extends Activity final Animation.AnimationListener l = new Animation.AnimationListener() { public void onAnimationStart(Animation a) { - mTabOverview.requestFocus(); - // Clear the listener so we don't trigger a tab - // selection. - mTabOverview.setListener(null); + if (mTabOverview != null) { + mTabOverview.requestFocus(); + // Clear the listener so we don't trigger a tab + // selection. + mTabOverview.setListener(null); + } } public void onAnimationRepeat(Animation a) {} public void onAnimationEnd(Animation a) { |