commit 05e449a0e419967ef623804de8d1ae5b3be0e9ce
author Kenny Root <kroot@android.com> Wed Aug 13 16:53:33 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 13 16:51:59 2014 +0000
tree bf74876166fd7d65d21bfb53fda8a7cf372b010d
parent cf5a7fc9fbaa8a084fb874ad2d6780c6914cd278
parent b224f0ae07dd86cd7493bd497e1174db52b3782d

Merge "Correct double-convert from uid to userid"

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 4335f8a..bda6948 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -970,14 +970,12 @@
     }
 
     ResponseCode writeMasterKey(const android::String8& pw, uid_t uid) {
-        uid_t user_id = get_user_id(uid);
-        UserState* userState = getUserState(user_id);
+        UserState* userState = getUserState(uid);
         return userState->writeMasterKey(pw, mEntropy);
     }
 
     ResponseCode readMasterKey(const android::String8& pw, uid_t uid) {
-        uid_t user_id = get_user_id(uid);
-        UserState* userState = getUserState(user_id);
+        UserState* userState = getUserState(uid);
         return userState->readMasterKey(pw, mEntropy);
     }