commit | dfeaab7419362fd0dd0aaaa1b123323947f7be36 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Fri Nov 14 17:56:03 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 14 17:56:03 2014 +0000 |
tree | 8d4e94c0de69107731bdbc8a235104d30de59fa1 | |
parent | 8127df96f5fd50cc216b74d51a7ab87397b02891 [diff] | |
parent | 13e867cb8d4f45f4a7c7a1552d89dfc5ec95f159 [diff] |
Merge "Call local finish(String) on cancel"
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java index 3859f05..23aa1a1 100644 --- a/src/com/android/keychain/KeyChainActivity.java +++ b/src/com/android/keychain/KeyChainActivity.java
@@ -127,7 +127,7 @@ case UNLOCK_CANCELED: // User wanted to cancel the request, so exit. mState = State.INITIAL; - finish(); + finish(null); return; default: throw new AssertionError();