commit 8f51d5aa3c0aae6bc9569bdbd370507d51bb3d0d
author Kenny Root <kroot@google.com> Wed Apr 17 10:37:11 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 17 10:37:11 2013 -0700
tree 2eb2de04d994290837e8909a9cf24ee77c610ba6
parent 79be3e3d4040ace3643bdda4b6e5d05588f52621
parent 360f51f7af191316cd739f229db1c5f7233be063

am 360f51f7: keystore: fix import as other UIDs

* commit '360f51f7af191316cd739f229db1c5f7233be063':
  keystore: fix import as other UIDs

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 5729dbd..9b08398 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -1727,7 +1727,7 @@
         }
 
         String8 name8(name);
-        String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, callingUid));
+        String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, targetUid));
 
         return mKeyStore->importKey(data, length, filename.string(), callingUid, flags);
     }