diff options
| author | Romain Guy <romainguy@google.com> | 2013-06-13 22:27:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-13 22:27:26 +0000 |
| commit | 4969fecf074c3e38dc560aaa283868ea728be946 (patch) | |
| tree | c53fecb81207d2c7013c3cc5d0a1dc5485b6430e /core/java/android/view/ViewRootImpl.java | |
| parent | 735760e3c28c18a86ba503031497cb2d5fa81903 (diff) | |
| parent | 70d4c5a0fe7f3411254df99b8e84b8e633d1fd05 (diff) | |
Merge "Fix possible NPE when a ViewRoot doesn't have a view"
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 3447494ca338..1b7fd1ebc1e8 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -2805,7 +2805,9 @@ public final class ViewRootImpl implements ViewParent, setAccessibilityFocus(null, null); - mView.assignParent(null); + if (mView != null) { + mView.assignParent(null); + } mView = null; mAttachInfo.mRootView = null; mAttachInfo.mSurface = null; |