diff options
author | George Mount <mount@google.com> | 2016-08-16 13:10:19 -0700 |
---|---|---|
committer | Adam Seaton <aseaton@google.com> | 2016-08-20 22:37:45 +0000 |
commit | c9373e5505752e64dd7ff581b23939d74b8880e4 (patch) | |
tree | f530c0df6f6eede2b511797dfb21e684647472a8 /tools/aapt2/diff/Diff.cpp | |
parent | b78a9bc5fea443c1a826888321fed5e06ee0c5d6 (diff) |
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)
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions