commit d91418f7961cb0b9db050aa35f934c729c61437d
author Kenny Root <kroot@google.com> Fri Sep 26 04:30:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 04:30:55 2014 +0000
tree 6fc9604b4502913ec8cc57f43ec6173ceb401982
parent f33c72fcd7b8e599e5d3d096ea3912fa3c53ff07
parent a39da5a226975f8b75f93de255a21d526ae8d334

am a39da5a2: Fallback to software keystore on import_key failure

* commit 'a39da5a226975f8b75f93de255a21d526ae8d334':
  Fallback to software keystore on import_key failure

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index b0a476e..3372d04 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -231,7 +231,7 @@
     return uid / AID_USER;
 }
 
-static bool keystore_selinux_check_access(uid_t uid, perm_t perm, pid_t spid) {
+static bool keystore_selinux_check_access(uid_t /*uid*/, perm_t perm, pid_t spid) {
     if (!ks_is_selinux_enabled) {
         return true;
     }