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

am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev

Browse Source 
* commit '2d53188b2ed3950f4d1c7e5163ba181c83ea5c85':
  Fix NPE when transitioning on unattached scene root.
This commit is contained in:
George Mount
2014-08-28 23:33:42 +00:00
committed by Android Git Automerger
parent c07292aa90 46a761db9a
commit 7b7499644c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/transition/Transition.java
View File

@@ -1656,7 +1656,7 @@ public abstract class Transition implements Cloneable {
WindowId windowId = sceneRoot.getWindowId();
for (int i = numOldAnims - 1; i >= 0; i--) {
AnimationInfo info = runningAnimators.valueAt(i);
if (info.view != null && windowId.equals(info.windowId)) {
if (info.view != null && windowId != null && windowId.equals(info.windowId)) {
Animator anim = runningAnimators.keyAt(i);
anim.pause();
}
@@ -1689,7 +1689,7 @@ public abstract class Transition implements Cloneable {
WindowId windowId = sceneRoot.getWindowId();
for (int i = numOldAnims - 1; i >= 0; i--) {
AnimationInfo info = runningAnimators.valueAt(i);
if (info.view != null && windowId.equals(info.windowId)) {
if (info.view != null && windowId != null && windowId.equals(info.windowId)) {
Animator anim = runningAnimators.keyAt(i);
anim.resume();
}