diff options
| author | Janis Danisevskis <jdanis@google.com> | 2019-04-17 14:06:09 -0700 |
|---|---|---|
| committer | Janis Danisevskis <jdanis@google.com> | 2019-04-17 14:10:28 -0700 |
| commit | f924b7e25db7e9701c26483f5c8f6da4ff3a20a0 (patch) | |
| tree | f9c3ec00b793bdb85174808e00c4cb249c074f6b /keystore/java/android/security/KeyStore.java | |
| parent | 88ef8325879b26bc522a060dc3a30823fcebde95 (diff) | |
Fix refactoring glitch in KeyStore.java
Bug: 129974578
Test: atest android.keystore.cts
Change-Id: I3ba732e15e522bd31e7eb813677d3ea884328cb6
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index f21fa5ef1486..646aa13664c4 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -764,12 +764,11 @@ public class KeyStore { KeyCharacteristicsPromise promise = new KeyCharacteristicsPromise(); mBinder.asBinder().linkToDeath(promise, 0); try { - KeyCharacteristicsCallbackResult result = null; int error = mBinder.importWrappedKey(promise, wrappedKeyAlias, wrappedKey, wrappingKeyAlias, maskingKey, args, rootSid, fingerprintSid); if (error != NO_ERROR) return error; - KeyCharacteristicsCallbackResult esult = promise.getFuture().get(); + KeyCharacteristicsCallbackResult result = promise.getFuture().get(); error = result.getKeystoreResponse().getErrorCode(); if (error != NO_ERROR) return error; |