From ebfc69434084e60b10c1b5d054a8cc42d8b47b25 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 15 Jul 2021 00:56:45 +0000 Subject: [PATCH] Revert "wifidisplay: restrict broadcast by the proper permission" This reverts commit fd8b6dabf9435026c867025eb3c6a85a07818f2f. Reason for revert: Remove from July 2021 Android Security Bulletin due to break existing applications. Bug: 176541017 Change-Id: I2acdeac519b001e6663b989a1e2adbcd3537d02e Test: install WFD application and check whether it works normally. --- core/java/android/hardware/display/DisplayManager.java | 3 --- .../com/android/server/display/WifiDisplayAdapter.java | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index cfacd5d97bcb5..0fa4ca8a574b5 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -61,9 +61,6 @@ public final class DisplayManager { * {@link #EXTRA_WIFI_DISPLAY_STATUS} extra. *

* This broadcast is only sent to registered receivers and can only be sent by the system. - *

- * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission is required to - * receive this broadcast. *

* @hide */ diff --git a/services/core/java/com/android/server/display/WifiDisplayAdapter.java b/services/core/java/com/android/server/display/WifiDisplayAdapter.java index 551df49b550f0..57323170b327a 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 @@ final class WifiDisplayAdapter extends DisplayAdapter { 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 @@ final class WifiDisplayAdapter extends DisplayAdapter { } // 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() {