Improve vold logging.
This patch adds more error logging to mountFstab. In a few cases, the
were error paths with no existing error logs. In other cases, the log
messages are there to help understand error flow in logs (for example
when a function with lots of error paths returns false).
Bug: 205314634
Test: treehugger builds
Change-Id: I464edc6e74ea0d7419ee9d9b75fd238752c13f4f
diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 50bba56..4b39aef 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -601,9 +601,15 @@
if (!generateKeyStorageKey(keystore, appId, &ksKey)) return false;
if (!writeStringToFile(ksKey, dir + "/" + kFn_keymaster_key_blob)) return false;
km::AuthorizationSet keyParams = beginParams(appId);
- if (!encryptWithKeystoreKey(keystore, dir, keyParams, key, &encryptedKey)) return false;
+ if (!encryptWithKeystoreKey(keystore, dir, keyParams, key, &encryptedKey)) {
+ LOG(ERROR) << "encryptWithKeystoreKey failed";
+ return false;
+ }
} else {
- if (!encryptWithoutKeystore(appId, key, &encryptedKey)) return false;
+ if (!encryptWithoutKeystore(appId, key, &encryptedKey)) {
+ LOG(ERROR) << "encryptWithoutKeystore failed";
+ return false;
+ }
}
if (!writeStringToFile(encryptedKey, dir + "/" + kFn_encrypted_key)) return false;
if (!FsyncDirectory(dir)) return false;
@@ -648,9 +654,15 @@
Keystore keystore;
if (!keystore) return false;
km::AuthorizationSet keyParams = beginParams(appId);
- if (!decryptWithKeystoreKey(keystore, dir, keyParams, encryptedMessage, key)) return false;
+ if (!decryptWithKeystoreKey(keystore, dir, keyParams, encryptedMessage, key)) {
+ LOG(ERROR) << "decryptWithKeystoreKey failed";
+ return false;
+ }
} else {
- if (!decryptWithoutKeystore(appId, encryptedMessage, key)) return false;
+ if (!decryptWithoutKeystore(appId, encryptedMessage, key)) {
+ LOG(ERROR) << "decryptWithoutKeystore failed";
+ return false;
+ }
}
return true;
}