Revert "wifidisplay: restrict broadcast by the proper permission"
This reverts commit cff8340c84ad1d6c0b3deae6a42f781e7db64082.
Reason for revert: Remove from July 2021 Android Security Bulletin due to break existing applications.
Bug: 176541017
Change-Id: Iacef744056630e85fb43d838a72abfae331cbaf4
Test: install WFD application and check whether it works normally.
(cherry picked from commit 955b64a6e71e21993c254bc4a1a12b507f5fd65d)
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java
index 99da669..c1ba209 100644
--- a/core/java/android/hardware/display/DisplayManager.java
+++ b/core/java/android/hardware/display/DisplayManager.java
@@ -61,9 +61,6 @@
* {@link #EXTRA_WIFI_DISPLAY_STATUS} extra.
* </p><p>
* This broadcast is only sent to registered receivers and can only be sent by the system.
- * </p><p>
- * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission is required to
- * receive this broadcast.
* </p>
* @hide
*/
diff --git a/services/core/java/com/android/server/display/WifiDisplayAdapter.java b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
index 551df49..5732317 100644
--- a/services/core/java/com/android/server/display/WifiDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/WifiDisplayAdapter.java
@@ -91,10 +91,6 @@
private boolean mPendingStatusChangeBroadcast;
- private static final String[] RECEIVER_PERMISSIONS_FOR_BROADCAST = {
- android.Manifest.permission.ACCESS_FINE_LOCATION,
- };
-
// Called with SyncRoot lock held.
public WifiDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
Context context, Handler handler, Listener listener,
@@ -436,8 +432,7 @@
}
// Send protected broadcast about wifi display status to registered receivers.
- getContext().createContextAsUser(UserHandle.ALL, 0)
- .sendBroadcastWithMultiplePermissions(intent, RECEIVER_PERMISSIONS_FOR_BROADCAST);
+ getContext().sendBroadcastAsUser(intent, UserHandle.ALL);
}
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {