DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). Bug: 177927831 Test: atest RoleSecurityTest Change-Id: I1254804fb72a299e782d45f938acdf979a82f904 (cherry picked from commit cf1bd25a37123624688f9965608a48d362ab4eb0)
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(