From 0eb58ae39d88a2fbfecabae8b10a4be5e4ebcc8c Mon Sep 17 00:00:00 2001
From: Bookatz <bookatz@google.com>
Date: Thu, 25 Jan 2018 15:49:26 -0800
Subject: [PATCH] Statsd broadcasts when it is alive 2

Continuation of ag/3508513.

Test: manually made sure the broadcast was sent
Bug: 70389379
Bug: 72450885

Change-Id: Ib49c5e967d3c8e31ef127347afa450ce8c5e170b
---
 core/res/AndroidManifest.xml                                   | 1 +
 .../java/com/android/server/stats/StatsCompanionService.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0861e710a224b..2a9633027ddcf 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -580,6 +580,7 @@
     <protected-broadcast android:name="android.app.action.TRANSFER_OWNERSHIP_COMPLETE" />
     <protected-broadcast android:name="android.app.action.AFFILIATED_PROFILE_TRANSFER_OWNERSHIP_COMPLETE" />
     <protected-broadcast android:name="android.app.action.DATA_SHARING_RESTRICTION_CHANGED" />
+    <protected-broadcast android:name="android.app.action.STATSD_STARTED" />
 
     <!-- ====================================================================== -->
     <!--                          RUNTIME PERMISSIONS                           -->
diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java
index faafb39cd1f30..662d6b71a2921 100644
--- a/services/core/java/com/android/server/stats/StatsCompanionService.java
+++ b/services/core/java/com/android/server/stats/StatsCompanionService.java
@@ -706,7 +706,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
         enforceCallingPermission();
         if (DEBUG) Slog.d(TAG, "learned that statsdReady");
         sayHiToStatsd(); // tell statsd that we're ready too and link to it
-        mContext.sendBroadcast(new Intent(StatsManager.ACTION_STATSD_STARTED),
+        mContext.sendBroadcastAsUser(new Intent(StatsManager.ACTION_STATSD_STARTED),
+                UserHandle.SYSTEM,
                 android.Manifest.permission.DUMP);
     }