commit 7675c9f2c7b62f5a127fd06af83223482ff9b594
author Rubin Xu <rubinxu@google.com> Wed Mar 15 19:26:52 2017 +0000
committer Rubin Xu <rubinxu@google.com> Thu Mar 16 12:05:14 2017 +0000
tree 6ce3646756526a4a649e3d8cb7d77bc0294f5e63
parent 9b3791caa8a5b5e93b8af5b0385470a16552f2b6

Add logging to keystore

Add extra logging to keystore in places where a key entry gets
deleted. This is to assist investigating a mysterious key missing
bug in keystore.

Bug: 35929605
Test: None
Change-Id: I423b401b0c411e20a8f0f631ffdcea74c4173961

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index c2d98bb..48b580c 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -118,6 +118,7 @@
         return ResponseCode::PERMISSION_DENIED;
     }
     String8 name8(name);
+    ALOGI("del %s %d", name8.string(), targetUid);
     String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, targetUid, ::TYPE_ANY));
     ResponseCode result = mKeyStore->del(filename.string(), ::TYPE_ANY, get_user_id(targetUid));
     if (result != ResponseCode::NO_ERROR) {
@@ -578,6 +579,7 @@
     if (!checkBinderPermissionSelfOrSystem(P_CLEAR_UID, targetUid)) {
         return ResponseCode::PERMISSION_DENIED;
     }
+    ALOGI("clear_uid %" PRId64, targetUid64);
 
     String8 prefix = String8::format("%u_", targetUid);
     Vector<String16> aliases;
@@ -1698,6 +1700,7 @@
     if (responseCode != ResponseCode::NO_ERROR) {
         return responseCode;
     }
+    ALOGI("upgradeKeyBlob %s %d", name8.string(), uid);
 
     auto hidlKey = blob2hidlVec(*blob);
     auto& dev = mKeyStore->getDevice(*blob);
@@ -1712,6 +1715,7 @@
         String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, uid, ::TYPE_KEYMASTER_10));
         error = mKeyStore->del(filename.string(), ::TYPE_ANY, get_user_id(uid));
         if (!error.isOk()) {
+            ALOGI("upgradeKeyBlob keystore->del failed %d", (int)error);
             return;
         }
 
@@ -1722,6 +1726,7 @@
 
         error = mKeyStore->put(filename.string(), &newBlob, get_user_id(uid));
         if (!error.isOk()) {
+            ALOGI("upgradeKeyBlob keystore->put failed %d", (int)error);
             return;
         }