tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Bug: 136196576
Change-Id: I63f1465fcd85a1cd09d850bd7882b950cee2012b
This commit is contained in:
Xin Li 2019-07-09 17:18:51 -07:00
commit fefc1997a5
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keystore/keystore_client_impl.cpp
View file

@ -436,7 +436,7 @@ bool KeystoreClientImpl::doesKeyExist(const std::string& key_name) {
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,

7
keystore/permissions.cpp
View file

@ -75,14 +75,7 @@ static user_perm user_perms[] = {
{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>(