diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-21 21:26:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-21 21:26:36 +0000 |
| commit | 00ddbbc8c38396d46fb838d7199e69303c989448 (patch) | |
| tree | 30a0c3d99784ba8b61ad2e8ff11dfdf26a422870 /core/java/android/widget | |
| parent | 32bdf16288d0105cd3aada878b4bda8fda10a037 (diff) | |
| parent | 6d89f482552067544d67716a469979769cdbe6b8 (diff) | |
Merge "Don't end transitions on a detached window, prevent crash in WindowId"
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 7217def3cf08..9553cf5e119c 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -2563,7 +2563,9 @@ public class PopupWindow { public void onViewDetachedFromWindow(View v) { v.removeOnAttachStateChangeListener(this); - TransitionManager.endTransitions(PopupDecorView.this); + if (isAttachedToWindow()) { + TransitionManager.endTransitions(PopupDecorView.this); + } } }; |