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

Merge "Fix race condition with GC in TransitionManager"

Browse Source
This commit is contained in:
Yuichi Araki
2018-05-07 22:12:58 +00:00
committed by Android (Google) Code Review
parent 24879d5b57 7c10e1e56c
commit d192911511
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/transition/TransitionManager.java
View File

@@ -210,14 +210,16 @@ public class TransitionManager {
private static ArrayMap<ViewGroup, ArrayList<Transition>> getRunningTransitions() {
WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>> runningTransitions =
sRunningTransitions.get();
if (runningTransitions == null || runningTransitions.get() == null) {
ArrayMap<ViewGroup, ArrayList<Transition>> transitions =
new ArrayMap<ViewGroup, ArrayList<Transition>>();
runningTransitions = new WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>>(
transitions);
sRunningTransitions.set(runningTransitions);
if (runningTransitions != null) {
ArrayMap<ViewGroup, ArrayList<Transition>> transitions = runningTransitions.get();
if (transitions != null) {
return transitions;
}
}
return runningTransitions.get();
ArrayMap<ViewGroup, ArrayList<Transition>> transitions = new ArrayMap<>();
runningTransitions = new WeakReference<>(transitions);
sRunningTransitions.set(runningTransitions);
return transitions;
}
private static void sceneChangeRunTransition(final ViewGroup sceneRoot,