commit 398a937c4b516174a68e6db1b30cb4fdccc6fbd9
author Nikhil Kumar <nykkumar@google.com> Thu Apr 06 15:51:56 2023 +0100
committer Nikhil Kumar <nykkumar@google.com> Mon Apr 17 10:41:06 2023 +0000
tree 3fea89fefeb48e098f7cbf774c0d97b889adab79
parent 3def94e8d5908c081132569c15d0767590153058

Send REMOTE_BUGREPORT request to the SYSTEM user.

Remote bugreports are triggered from device owner apps which are on
user 0, to kee everything on the same user the bugreport generation
should be handled by user 0.

Test: manually tested remote bugreport flow in retail demo mode
Bug: 274543518
Change-Id: Ied7072e5cd82a0afda148951dcd9d01c2355d957

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 ef7d5ae..8139495 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -368,7 +368,6 @@
 import android.util.IndentingPrintWriter;
 import android.util.IntArray;
 import android.util.Log;
-import android.util.LogWriter;
 import android.util.Pair;
 import android.util.PrintWriterPrinter;
 import android.util.Slog;
@@ -7308,7 +7307,14 @@
             // Send broadcast to shell to trigger bugreport using Bugreport API
             // Always start the shell process on the current user to ensure that
             // the foreground user can see all bugreport notifications.
-            mContext.sendBroadcastAsUser(triggerShellBugreport, getCurrentUser().getUserHandle());
+            // In case of BUGREPORT_MODE_REMOTE send the broadcast to SYSTEM user as the device
+            // owner apps are running on the SYSTEM user.
+            if (bugreportType == BugreportParams.BUGREPORT_MODE_REMOTE) {
+                mContext.sendBroadcastAsUser(triggerShellBugreport, UserHandle.SYSTEM);
+            } else {
+                mContext.sendBroadcastAsUser(triggerShellBugreport,
+                        getCurrentUser().getUserHandle());
+            }
         } finally {
             Binder.restoreCallingIdentity(identity);
         }