diff options
| author | Kenny Root <kroot@google.com> | 2014-11-14 19:06:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 19:06:55 +0000 |
| commit | 1493cd63e501450cd15103baecc0837ef1778e23 (patch) | |
| tree | 212046cfb90dbba8529d00d2bf64145138a6f899 | |
| parent | 814d42826529215994d7ba64dce142ff2261804e (diff) | |
| parent | 137cd8d87d62a612a33cae0d8e2b8c440dccaee0 (diff) | |
| download | android_packages_apps_KeyChain-1493cd63e501450cd15103baecc0837ef1778e23.tar.gz android_packages_apps_KeyChain-1493cd63e501450cd15103baecc0837ef1778e23.tar.bz2 android_packages_apps_KeyChain-1493cd63e501450cd15103baecc0837ef1778e23.zip | |
am 137cd8d8: Call local finish(String) on cancel
* commit '137cd8d87d62a612a33cae0d8e2b8c440dccaee0':
Call local finish(String) on cancel
| -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(); |