commit 9f22467a12ea78a164570029a5aecd886f892a04
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 11 03:52:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 11 03:52:58 2019 +0000
tree 371f7a7227b13af7943258ca6da7bd3766895f9d
parent 40983e6ab750e3ea370f27a603e4929cb7463a55
parent fefc1997a54a5ec3a320f81c1c9007361457b5c7

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"

keystore/keystore_client_impl.cpp

diff --git a/keystore/keystore_client_impl.cpp b/keystore/keystore_client_impl.cpp
index b9a142e..140931b 100644
--- a/keystore/keystore_client_impl.cpp
+++ b/keystore/keystore_client_impl.cpp
@@ -436,7 +436,7 @@
     int32_t result;
     auto binder_result = keystore_->exist(key_name16, kDefaultUID, &result);
     if (!binder_result.isOk()) return false;  // binder error
-    return result == static_cast<int32_t>(ResponseCode::NO_ERROR);
+    return result;
 }
 
 bool KeystoreClientImpl::listKeys(const std::string& prefix,

keystore/permissions.cpp

diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index a172761..3f2c46d 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -75,14 +75,7 @@
     {AID_SYSTEM, static_cast<perm_t>((uint32_t)(~0))},
     {AID_VPN, static_cast<perm_t>(P_GET | P_SIGN | P_VERIFY)},
     {AID_WIFI, static_cast<perm_t>(P_GET | P_SIGN | P_VERIFY)},
-    {AID_BLUETOOTH, static_cast<perm_t>(P_GET | P_INSERT | P_DELETE | P_EXIST | P_SIGN | P_VERIFY)},
-
-#ifdef GRANT_ROOT_ALL_PERMISSIONS
-    // Allow VTS tests running as root to perform all operations
-    {AID_ROOT, static_cast<perm_t>((uint32_t)(~0))},
-#else
     {AID_ROOT, static_cast<perm_t>(P_GET)},
-#endif
 };
 
 static const perm_t DEFAULT_PERMS = static_cast<perm_t>(