OSDN Git Service

Fix NPE when combining pop with add transaction.
authorGeorge Mount <mount@google.com>
Wed, 1 Mar 2017 23:38:02 +0000 (15:38 -0800)
committerGeorge Mount <mount@google.com>
Thu, 2 Mar 2017 00:51:21 +0000 (16:51 -0800)
commitf05db56f242da7a0bd3770d69eb816091b303d3d
tree24ae8d5219708dfdc2858de8017d98ee5f4a665e
parent43d059bf486969912b404b9d5f11ac0d2b9e7b89
Fix NPE when combining pop with add transaction.

Bug 35832085

When pop transactions and an add transaction are acting
in the same frame, optimized tranactions can work properly,
but unoptimized transactions have no guarantees. This fixes
a crash with unoptimized transactions so they will at least
not break.

Test: I996f54ae2540f31134e6a9a28870826a73ea1610
Change-Id: I3890dd30e9aff70f4ac142773de8479f1a9dffc8
core/java/android/app/FragmentTransition.java