From e3bc8dbd591ba8f19959b96d50be51d22e828b63 Mon Sep 17 00:00:00 2001 From: Hanna Nizhnikava Date: Wed, 2 Mar 2022 20:31:54 +0000 Subject: [PATCH] Add tag to sandbox crashes This tag in ActivityManager is required to get the sandbox crash stack traces, which will be read by GMSCore and sent to clearcut without any user or device identification. Bug: 221878062 Test: manual, by causing SdkSandbox Test App (go/sdk-sandbox-manual-testing) crash and logging the resulting DropBox header. Change-Id: I0f3a771f02027170952ec03d1ef9b4a323c67fa0 --- .../java/com/android/server/am/ActivityManagerService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 47f9fd535801d..d42b55ccd8730 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -79,6 +79,7 @@ import static android.os.Process.ZYGOTE_POLICY_FLAG_LATENCY_SENSITIVE; import static android.os.Process.ZYGOTE_POLICY_FLAG_SYSTEM_PROCESS; import static android.os.Process.ZYGOTE_PROCESS; import static android.os.Process.getTotalMemory; +import static android.os.Process.isSdkSandboxUid; import static android.os.Process.isThreadInProcess; import static android.os.Process.killProcess; import static android.os.Process.killProcessQuiet; @@ -8561,6 +8562,9 @@ public class ActivityManagerService extends IActivityManager.Stub if (process.info.isInstantApp()) { sb.append("Instant-App: true\n"); } + if (isSdkSandboxUid(process.uid)) { + sb.append("SdkSandbox: true\n"); + } } }