Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix NPE when fragment container is null" into oc-dev

Browse Source 
am: 38eae1bb15

Change-Id: I51b07b1e8f05410737205539be630a0c463ddd3a
This commit is contained in:
George Mount
2017-04-20 20:47:51 +00:00
committed by android-build-merger
parent be699f8a36 38eae1bb15
commit 01c9ed8b7e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/FragmentManager.java
View File

@@ -1464,13 +1464,17 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
} else {
final ViewGroup container = fragment.mContainer;
final View animatingView = fragment.mView;
container.startViewTransition(animatingView);
if (container != null) {
container.startViewTransition(animatingView);
}
// Delay the actual hide operation until the animation finishes, otherwise
// the fragment will just immediately disappear
anim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
container.endViewTransition(animatingView);
if (container != null) {
container.endViewTransition(animatingView);
}
animation.removeListener(this);
animatingView.setVisibility(View.GONE);
}