commit f924b7e25db7e9701c26483f5c8f6da4ff3a20a0
author Janis Danisevskis <jdanis@google.com> Wed Apr 17 14:06:09 2019 -0700
committer Janis Danisevskis <jdanis@google.com> Wed Apr 17 14:10:28 2019 -0700
tree f9c3ec00b793bdb85174808e00c4cb249c074f6b
parent 88ef8325879b26bc522a060dc3a30823fcebde95

Fix refactoring glitch in KeyStore.java

Bug: 129974578
Test: atest android.keystore.cts
Change-Id: I3ba732e15e522bd31e7eb813677d3ea884328cb6

keystore/java/android/security/KeyStore.java

diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index f21fa5e..646aa13 100644
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -764,12 +764,11 @@
         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;