diff options
| author | Kenny Root <kroot@google.com> | 2014-11-14 18:02:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 18:02:56 +0000 |
| commit | 6ee8c8a8cb2391241985b9c61a86271f00a3d9ce (patch) | |
| tree | 212046cfb90dbba8529d00d2bf64145138a6f899 /src | |
| parent | a43677145544d5908e393b959e02f4d4ea070b44 (diff) | |
| parent | dfeaab7419362fd0dd0aaaa1b123323947f7be36 (diff) | |
| download | android_packages_apps_KeyChain-6ee8c8a8cb2391241985b9c61a86271f00a3d9ce.tar.gz android_packages_apps_KeyChain-6ee8c8a8cb2391241985b9c61a86271f00a3d9ce.tar.bz2 android_packages_apps_KeyChain-6ee8c8a8cb2391241985b9c61a86271f00a3d9ce.zip | |
am dfeaab74: Merge "Call local finish(String) on cancel"
* commit 'dfeaab7419362fd0dd0aaaa1b123323947f7be36':
Call local finish(String) on cancel
Diffstat (limited to 'src')
| -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(); |