commit | 087077bf2f484efa86c78326ccf8e76e9ddff4ed | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Thu Jul 31 14:03:16 2014 -0700 |
committer | Kenny Root <kroot@google.com> | Thu Jul 31 16:05:15 2014 -0700 |
tree | cc106cf772232e5cdbe5fa58711532b62b3fd571 | |
parent | 759152ea160fe146abbea2e9d6ae2e5918652571 [diff] |
Make sure a "Cancel" is honored When the user refuses to set up a lockscreen password, pressing Cancel wasn't honored the first time because onResume was still called after onActivityResult. Instead set the state in onActivityResult and call finish in onResume. (cherry picked from commit 6ba32f209ee230b7ffff7f6884360b23ea1b3c18) Bug: 13962060 Change-Id: I439592b2236261fa683484cd5c3ba26795aece47