diff options
| -rw-r--r-- | core/java/android/app/EnterTransitionCoordinator.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index e2082f754abc..180725efe0ae 100644 --- a/core/java/android/app/EnterTransitionCoordinator.java +++ b/core/java/android/app/EnterTransitionCoordinator.java @@ -706,8 +706,12 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { } private boolean allowOverlappingTransitions() { - return mIsReturning ? getWindow().getAllowReturnTransitionOverlap() - : getWindow().getAllowEnterTransitionOverlap(); + final Window window = getWindow(); + if (window == null) { + return false; + } + return mIsReturning ? window.getAllowReturnTransitionOverlap() + : window.getAllowEnterTransitionOverlap(); } private void startRejectedAnimations(final ArrayList<View> rejectedSnapshots) { |