commit 7a25f1bc43beeba33daf7ccb1540218b7847843a
author Olivier Gaillard <gaillard@google.com> Thu Jul 13 23:19:05 2023 +0000
committer Olivier Gaillard <gaillard@google.com> Mon Jul 24 07:35:12 2023 +0000
tree e7504559b2b2f088198ed0fb8c14f8885b772f66
parent eb9df37e70c0fb4d1ffa7105baed3efb8ac11566

Fix the process header for system server strict mode dropbox entries.

Should be system_server instead of unknown.

Change-Id: Ib4005252dc99180fc54b3fc63b06ca3e17ee230a

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 26bcb98..132d6a9 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -9013,7 +9013,9 @@
         final boolean isSystemApp = process == null ||
                 (process.info.flags & (ApplicationInfo.FLAG_SYSTEM |
                                        ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0;
-        final String processName = process == null ? "unknown" : process.processName;
+        final String processName = process != null && process.getPid() == MY_PID
+                ? "system_server"
+                : (process == null ? "unknown" : process.processName);
         final DropBoxManager dbox = (DropBoxManager)
                 mContext.getSystemService(Context.DROPBOX_SERVICE);