commit e827f221ea157baaa6edc8ee8d62b1be79c7e264
author Kenny Root <kroot@google.com> Thu Apr 04 10:06:47 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 04 10:06:47 2013 -0700
tree 3f37922a45e1b6755e1072a1022d95c36b349bcc
parent 6e0981bcb33993ab623238e43879c21cdf527c9f
parent 2ca3b1b25e8ceb841396061a318d3a043cbfcb54

am 2ca3b1b2: Fix CL split and build

* commit '2ca3b1b25e8ceb841396061a318d3a043cbfcb54':
  Fix CL split and build

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index fdbea3d..34cab24 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -687,7 +687,7 @@
              */
             if (upgrade(filename, keyBlob, version, type)) {
                 if ((rc = this->put(filename, keyBlob)) != NO_ERROR
-                        || (rc = keyBlob->readBlob(filename, &mMasterKeyDecryption)) != NO_ERROR) {
+                        || (rc = keyBlob->decryptBlob(filename, &mMasterKeyDecryption)) != NO_ERROR) {
                     return rc;
                 }
             }