From fa006ae45148b3701cd1ce871d1fab68e077806c Mon Sep 17 00:00:00 2001
From: Rubin Xu <rubinxu@google.com>
Date: Tue, 3 Nov 2020 23:38:12 +0000
Subject: [PATCH] Revert "Mark ACTION_REMOTE_BUGREPORT_DISPATCH broadcast as
 protected"

This reverts commit 1ca0e68d58203c9bab3819ec42359028001aa254.

Reason for revert: CTS failure b/171979563
Bug: 171979563
Bug: 171495100
Change-Id: Ie7a8b2eacee8c40c02d47651c5db25e87da95f3f
---
 core/java/android/app/admin/DevicePolicyManager.java | 2 +-
 core/res/AndroidManifest.xml                         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 8d4de26754724..ad902a028f13b 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -525,7 +525,7 @@ public class DevicePolicyManager {
      * @hide
      */
     public static final String ACTION_REMOTE_BUGREPORT_DISPATCH =
-            "com.android.server.action.REMOTE_BUGREPORT_DISPATCH";
+            "android.intent.action.REMOTE_BUGREPORT_DISPATCH";
 
     /**
      * Extra for shared bugreport's SHA-256 hash.
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 5e76831137ed7..8a7fa04b3cf4e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -349,7 +349,6 @@
     <protected-broadcast android:name="com.android.server.WifiManager.action.START_PNO" />
     <protected-broadcast android:name="com.android.server.WifiManager.action.DELAYED_DRIVER_STOP" />
     <protected-broadcast android:name="com.android.server.WifiManager.action.DEVICE_IDLE" />
-    <protected-broadcast android:name="com.android.server.action.REMOTE_BUGREPORT_DISPATCH" />
     <protected-broadcast android:name="com.android.server.action.REMOTE_BUGREPORT_SHARING_ACCEPTED" />
     <protected-broadcast android:name="com.android.server.action.REMOTE_BUGREPORT_SHARING_DECLINED" />
     <protected-broadcast android:name="com.android.internal.action.EUICC_FACTORY_RESET" />