From 6a67dd5bfff77cf625569ac15c26a81cfb09423d Mon Sep 17 00:00:00 2001
From: Gavin Corkery <gavincorkery@google.com>
Date: Mon, 19 Apr 2021 23:37:14 +0100
Subject: [PATCH] Send BUGREPORT_REQUESTED broadcast to system user

This broadcast should have a qualified user since
it is being sent from the system. This broadcast
is being sent to the shell, so we should use
UserHandle.SYSTEM.

Test: atest CtsBugreportTestCases, check logcat
      for warnings
Bug: 180769102
Change-Id: I3bebc886cf9931ea79fa0e91312d8720e5bd0e7d
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index e3b06d6964236..97ad93cc8753f 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6487,7 +6487,7 @@ public class ActivityManagerService extends IActivityManager.Stub
         final long identity = Binder.clearCallingIdentity();
         try {
             // Send broadcast to shell to trigger bugreport using Bugreport API
-            mContext.sendBroadcast(triggerShellBugreport);
+            mContext.sendBroadcastAsUser(triggerShellBugreport, UserHandle.SYSTEM);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }