commit 7f39ba09b8ccad2ae50874d3643cdc93746391ea
author Hai Zhang <zhanghai@google.com> Wed Jun 16 00:20:52 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 23:58:46 2021 +0000
tree 3c10e5838bea6f2baf4db6f678648a8a973ca428
parent 49cb41f9d7d2ec741bc2ec27717283dc560a9060

DO NOT MERGE Add cross-user check for getDefaultSmsPackage().

Bug: 177927831
Test: atest RoleSecurityTest
Change-Id: I1254804fb72a299e782d45f938acdf979a82f904
(cherry picked from commit cf1bd25a37123624688f9965608a48d362ab4eb0)

services/core/java/com/android/server/role/RoleManagerService.java

diff --git a/services/core/java/com/android/server/role/RoleManagerService.java b/services/core/java/com/android/server/role/RoleManagerService.java
index 392792d..b75bce8 100644
--- a/services/core/java/com/android/server/role/RoleManagerService.java
+++ b/services/core/java/com/android/server/role/RoleManagerService.java
@@ -662,6 +662,12 @@
 
         @Override
         public String getDefaultSmsPackage(int userId) {
+            userId = handleIncomingUser(userId, false, "getDefaultSmsPackage");
+            if (!mUserManagerInternal.exists(userId)) {
+                Slog.e(LOG_TAG, "user " + userId + " does not exist");
+                return null;
+            }
+
             long identity = Binder.clearCallingIdentity();
             try {
                 return CollectionUtils.firstOrNull(