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

am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev

Browse Source 
* commit '95d520f160db65f90da56610eee1a047fb60fc4e':
  Fix NPE in moveSharedElementsToOverlay
This commit is contained in:
George Mount
2014-10-28 17:04:33 +00:00
committed by Android Git Automerger
parent 69a3dd85df 95d520f160
commit 8a536bb4e0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityTransitionCoordinator.java
View File

@@ -798,7 +798,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
} }
protected void moveSharedElementsToOverlay() { protected void moveSharedElementsToOverlay() {
if (!mWindow.getSharedElementsUseOverlay()) { if (mWindow == null || !mWindow.getSharedElementsUseOverlay()) {
return; return;
} }
setSharedElementMatrices(); setSharedElementMatrices();