commit de087d874662c1b1d2fb657e0b474b58c4890016
author Bill Yi <byi@google.com> Wed May 06 15:59:08 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 06 15:59:08 2020 +0000
tree 73bc54e8ad22f276df5408a31eab469cfbc52779
parent a2ff64573e1de2037a108c9419eb25f75d332a09
parent 3255773023e01d6586db3c11a19792050ce22872

Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE"

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 0cefa13..fc85616 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1072,7 +1072,7 @@
 
     uid_t callingUid = IPCThreadState::self()->getCallingUid();
 
-    if (isDeviceIdAttestationRequested(params) && (get_app_id(callingUid) != AID_SYSTEM)) {
+    if (needsPermissionToAttestDeviceIds(params) && (get_app_id(callingUid) != AID_SYSTEM)) {
         return AIDL_RETURN(KeyStoreServiceReturnCode(ErrorCode::INVALID_ARGUMENT));
     }