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

Commit 1f686025 authored by Bo Zhu's avatar Bo Zhu
Browse files

Remove the extra logging for debugging decryption errors 

Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ie01eea9256584632994fd8d9f31570a86f582051
parent 41ed367a

services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java

+0 −13
Original line number Diff line number Diff line
@@ -570,12 +570,6 @@ public class RecoverableKeyStoreManager { 
            throws RemoteException, ServiceSpecificException {

        byte[] locallyEncryptedKey;

        try {

            // TODO: Remove the extraneous logging here

            Log.d(TAG, constructLoggingMessage("sessionEntry.getKeyClaimant()",

                    sessionEntry.getKeyClaimant()));

            Log.d(TAG, constructLoggingMessage("sessionEntry.getVaultParams()",

                    sessionEntry.getVaultParams()));

            Log.d(TAG, constructLoggingMessage("encryptedClaimResponse", encryptedClaimResponse));

            locallyEncryptedKey = KeySyncUtils.decryptRecoveryClaimResponse(

                    sessionEntry.getKeyClaimant(),

                    sessionEntry.getVaultParams(),
@@ -594,10 +588,6 @@ public class RecoverableKeyStoreManager { 
        }



        try {

            // TODO: Remove the extraneous logging here

            Log.d(TAG, constructLoggingMessage("sessionEntry.getLskfHash()",

                    sessionEntry.getLskfHash()));

            Log.d(TAG, constructLoggingMessage("locallyEncryptedKey", locallyEncryptedKey));

            return KeySyncUtils.decryptRecoveryKey(sessionEntry.getLskfHash(), locallyEncryptedKey);

        } catch (InvalidKeyException e) {

            Log.e(TAG, "Got InvalidKeyException during decrypting recovery key", e);
@@ -636,9 +626,6 @@ public class RecoverableKeyStoreManager { 
            byte[] encryptedKeyMaterial = applicationKey.getEncryptedKeyMaterial();



            try {

                // TODO: Remove the extraneous logging here

                Log.d(TAG, constructLoggingMessage("recoveryKey", recoveryKey));

                Log.d(TAG, constructLoggingMessage("encryptedKeyMaterial", encryptedKeyMaterial));

                byte[] keyMaterial =

                        KeySyncUtils.decryptApplicationKey(recoveryKey, encryptedKeyMaterial);

                keyMaterialByAlias.put(alias, keyMaterial);