From 11c16574e9dc2e3c142c895a1ef45498b1dae59b Mon Sep 17 00:00:00 2001
From: Aseem Kumar <aseemk@google.com>
Date: Wed, 11 Jun 2025 18:41:20 -0700
Subject: [SP 2025-09-01] Don't allow SdkSandbox to bypass systemUid check.

Test: atest

Flag: EXEMPT security fix

Bug: 397438392
Change-Id: I1003ac2a795c869aaeb292692b2681c7a5c8d12e
(cherry picked from commit d400709160c8374d83a15dc7623b11434c08c4c6)
---
 .../core/java/com/android/server/accounts/AccountManagerService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 79fdcca9f75d..dc59b65a343d 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -6056,6 +6056,9 @@ public class AccountManagerService
     }
 
     private boolean isSystemUid(int callingUid) {
+        if (Process.isSdkSandboxUid(callingUid)) {
+            return false;
+        }
         String[] packages = null;
         final long ident = Binder.clearCallingIdentity();
         try {
-- 
cgit v1.2.3-59-g8ed1b