diff options
| author | Kenny Root <kroot@google.com> | 2014-11-14 08:34:57 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-11-14 17:55:30 +0000 |
| commit | 137cd8d87d62a612a33cae0d8e2b8c440dccaee0 (patch) | |
| tree | 212046cfb90dbba8529d00d2bf64145138a6f899 | |
| parent | 1f00eaf6936421542f139f1066bd4656af3a8b11 (diff) | |
| download | android_packages_apps_KeyChain-137cd8d87d62a612a33cae0d8e2b8c440dccaee0.tar.gz android_packages_apps_KeyChain-137cd8d87d62a612a33cae0d8e2b8c440dccaee0.tar.bz2 android_packages_apps_KeyChain-137cd8d87d62a612a33cae0d8e2b8c440dccaee0.zip | |
Call local finish(String) on cancel
Change I439592b2236261fa683484cd5c3ba26795aece47 to honor "Cancel"
button presses caused a call directly into finish() instead of the local
finish(String) which does some extra administrivia.
(cherry picked from commit 13e867cb8d4f45f4a7c7a1552d89dfc5ec95f159)
Bug: 18381187
Bug: https://code.google.com/p/android/issues/detail?id=79208
Change-Id: Ica7f52ce3afa82d95ea5cc3cb15c9ac7b734cf93
| -rw-r--r-- | src/com/android/keychain/KeyChainActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class KeyChainActivity extends Activity { case UNLOCK_CANCELED: // User wanted to cancel the request, so exit. mState = State.INITIAL; - finish(); + finish(null); return; default: throw new AssertionError(); |