commit d7103242b4713e1e1ece7ab39f7e0e84b7946cb9
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 25 22:08:14 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 25 22:08:14 2021 +0000
tree b373b9e0541e7a85f90d842e7fdb3e694463004c
parent c51f1fc24a4ae212662bed41a24a9779625b0268
parent b378ebe0c596a59e681dd5470a2769bf8246cc8a

Merge "Add cross-user check for getSmsRoleHolder()." into sc-dev

service/java/com/android/role/RoleService.java

diff --git a/service/java/com/android/role/RoleService.java b/service/java/com/android/role/RoleService.java
index 5df76c4..802e38b 100644
--- a/service/java/com/android/role/RoleService.java
+++ b/service/java/com/android/role/RoleService.java
@@ -704,6 +704,12 @@
 
         @Override
         public String getSmsRoleHolder(int userId) {
+            enforceCrossUserPermission(userId, false, "getSmsRoleHolder");
+            if (!isUserExistent(userId)) {
+                Log.e(LOG_TAG, "user " + userId + " does not exist");
+                return null;
+            }
+
             final long identity = Binder.clearCallingIdentity();
             try {
                 return CollectionUtils.firstOrNull(getRoleHoldersAsUser(RoleManager.ROLE_SMS,