OSDN Git Service

DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.
authorGeorge Mount <mount@google.com>
Tue, 16 Aug 2016 20:10:19 +0000 (13:10 -0700)
committerAdam Seaton <aseaton@google.com>
Sat, 20 Aug 2016 22:37:45 +0000 (22:37 +0000)
commitc9373e5505752e64dd7ff581b23939d74b8880e4
treef530c0df6f6eede2b511797dfb21e684647472a8
parentb78a9bc5fea443c1a826888321fed5e06ee0c5d6
DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.

Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa289f560d60611dddef9441c9614fd883a)
(cherry picked from commit a3edbf6a5d4698570f2b5610390b5c70251f52d7)
core/java/android/app/ActivityTransitionState.java