summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-01-10 10:56:34 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-10 10:56:34 -0800
commitac058852e719cf2e5106127dee613334dbdded44 (patch)
tree554915cc4549ef39b32eed188805d14d364f80cd
parent712b055ea3c92a739bdb9629c31664105f597ab2 (diff)
parent0755fcde2dfef68344188a02d16745f516547c69 (diff)
downloadpackages_apps_Browser-ac058852e719cf2e5106127dee613334dbdded44.zip
packages_apps_Browser-ac058852e719cf2e5106127dee613334dbdded44.tar.gz
packages_apps_Browser-ac058852e719cf2e5106127dee613334dbdded44.tar.bz2
am 0755fcde: Avoid ISE
* commit '0755fcde2dfef68344188a02d16745f516547c69': Avoid ISE
-rw-r--r--src/com/android/browser/PhoneUi.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 1bc0f77..ee5ca40 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -428,7 +428,9 @@ public class PhoneUi extends BaseUi {
mAnimScreen = new AnimScreen(mActivity);
}
mAnimScreen.set(tab.getScreenshot());
- mCustomViewContainer.addView(mAnimScreen.mMain, COVER_SCREEN_PARAMS);
+ if (mAnimScreen.mMain.getParent() == null) {
+ mCustomViewContainer.addView(mAnimScreen.mMain, COVER_SCREEN_PARAMS);
+ }
mAnimScreen.mMain.layout(0, 0, mContentView.getWidth(),
mContentView.getHeight());
mNavScreen.mScroller.finishScroller();