Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f924b7e2 authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Fix refactoring glitch in KeyStore.java 

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

keystore/java/android/security/KeyStore.java

+1 −2
Original line number Diff line number Diff line
@@ -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;