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
1 file changed
tree: cc106cf772232e5cdbe5fa58711532b62b3fd571
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml