Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75c74a40 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am c3661b16: am 1fcdee0d: am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev 

* commit 'c3661b16':
  Fix bug in Scene's use of setTag
parents a1685b19 c3661b16

core/java/android/transition/Scene.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public final class Scene { 
                com.android.internal.R.id.scene_layoutid_cache);

        if (scenes == null) {

            scenes = new SparseArray<Scene>();

            sceneRoot.setTag(com.android.internal.R.id.scene_layoutid_cache, scenes);

            sceneRoot.setTagInternal(com.android.internal.R.id.scene_layoutid_cache, scenes);

        }

        Scene scene = scenes.get(layoutId);

        if (scene != null) {