Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev

Browse Source
This commit is contained in:
Jimmy Chen
2021-04-01 01:42:20 +00:00
committed by Android (Google) Code Review
parent 65eb4a4332 cff8340c84
commit 3d6cf521c1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/hardware/display/DisplayManager.java
View File

@@ -61,6 +61,9 @@ public final class DisplayManager {
* {@link #EXTRA_WIFI_DISPLAY_STATUS} extra. * {@link #EXTRA_WIFI_DISPLAY_STATUS} extra.
* </p><p> * </p><p>
* This broadcast is only sent to registered receivers and can only be sent by the system. * 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> * </p>
* @hide * @hide
*/ */

7
services/core/java/com/android/server/display/WifiDisplayAdapter.java
View File

@@ -91,6 +91,10 @@ final class WifiDisplayAdapter extends DisplayAdapter {
private boolean mPendingStatusChangeBroadcast; private boolean mPendingStatusChangeBroadcast;
private static final String[] RECEIVER_PERMISSIONS_FOR_BROADCAST = {
android.Manifest.permission.ACCESS_FINE_LOCATION,
};
// Called with SyncRoot lock held. // Called with SyncRoot lock held.
public WifiDisplayAdapter(DisplayManagerService.SyncRoot syncRoot, public WifiDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
Context context, Handler handler, Listener listener, Context context, Handler handler, Listener listener,
@@ -432,7 +436,8 @@ final class WifiDisplayAdapter extends DisplayAdapter {
} }
// Send protected broadcast about wifi display status to registered receivers. // Send protected broadcast about wifi display status to registered receivers.
getContext().sendBroadcastAsUser(intent, UserHandle.ALL); getContext().createContextAsUser(UserHandle.ALL, 0)
.sendBroadcastWithMultiplePermissions(intent, RECEIVER_PERMISSIONS_FOR_BROADCAST);
} }
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {