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

am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev

Browse Source 
* commit '44673720ac0c4eb37f56f16d262cf5da68064fe2':
  Fixed NPE in EnterTransitionCoordinator
This commit is contained in:
George Mount
2014-09-12 18:52:13 +00:00
committed by Android Git Automerger
parent 5343993e0c 2418d7381f
commit fc6114389e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/EnterTransitionCoordinator.java
View File

@@ -329,7 +329,10 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
@Override
public void run() {
if (mAnimations++ < MIN_ANIMATION_FRAMES) {
getDecor().postOnAnimation(this);
View decorView = getDecor();
if (decorView != null) {
decorView.postOnAnimation(this);
}
} else if (mResultReceiver != null) {
mResultReceiver.send(MSG_HIDE_SHARED_ELEMENTS, null);
mResultReceiver = null; // all done sending messages.