diff options
author | Craig Mautner <cmautner@google.com> | 2012-10-23 17:01:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 17:01:20 -0700 |
commit | a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c (patch) | |
tree | abe77c741c3d4959b60427a00b5428c21e898c94 /core/java/android/view/ViewRootImpl.java | |
parent | b68a3a47eff1f61322f3f65d1f9e89753676d8e7 (diff) | |
parent | 9e96c69e3e9ebdb820acd347b4691c32a5d76be4 (diff) | |
download | frameworks_base-a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c.zip frameworks_base-a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c.tar.gz frameworks_base-a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c.tar.bz2 |
am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit '9e96c69e3e9ebdb820acd347b4691c32a5d76be4':
Add throwing InvalidDisplayException from addView.
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
-rw-r--r-- | core/java/android/view/ViewRootImpl.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 95576e9..9164a8b 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -558,7 +558,6 @@ public final class ViewRootImpl implements ViewParent, mPendingVisibleInsets.set(0, 0, 0, 0); if (DEBUG_LAYOUT) Log.v(TAG, "Added window " + mWindow); if (res < WindowManagerGlobal.ADD_OKAY) { - mView = null; mAttachInfo.mRootView = null; mAdded = false; mFallbackEventHandler.setView(null); @@ -594,6 +593,10 @@ public final class ViewRootImpl implements ViewParent, throw new WindowManager.BadTokenException( "Unable to add window " + mWindow + " -- permission denied for this window type"); + case WindowManagerGlobal.ADD_INVALID_DISPLAY: + throw new WindowManager.InvalidDisplayException( + "Unable to add window " + mWindow + + " -- the specified display can not be found"); } throw new RuntimeException( "Unable to add window -- unknown error code " + res); @@ -810,27 +813,21 @@ public final class ViewRootImpl implements ViewParent, } } - /** - * {@inheritDoc} - */ + @Override public void requestFitSystemWindows() { checkThread(); mFitSystemWindowsRequested = true; scheduleTraversals(); } - /** - * {@inheritDoc} - */ + @Override public void requestLayout() { checkThread(); mLayoutRequested = true; scheduleTraversals(); } - /** - * {@inheritDoc} - */ + @Override public boolean isLayoutRequested() { return mLayoutRequested; } @@ -850,6 +847,7 @@ public final class ViewRootImpl implements ViewParent, } } + @Override public void invalidateChild(View child, Rect dirty) { invalidateChildInParent(null, dirty); } |