diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2021-04-01 01:42:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-01 01:42:20 +0000 |
| commit | 3d6cf521c1a062ed0a009fce466b5069a9cd9192 (patch) | |
| tree | 7d7878c4527d056287ba6349bdf7e1a9adde1dd1 | |
| parent | 65eb4a433260f1a28e0f2aced9bd551ec6657de7 (diff) | |
| parent | cff8340c84ad1d6c0b3deae6a42f781e7db64082 (diff) | |
| download | base-3d6cf521c1a062ed0a009fce466b5069a9cd9192.tar.gz | |
Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev
| -rw-r--r-- | core/java/android/hardware/display/DisplayManager.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/display/WifiDisplayAdapter.java | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index c1ba2094d3cf..99da66979892 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -61,6 +61,9 @@ public final class DisplayManager { * {@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 57323170b327..551df49b550f 100644 --- a/services/core/java/com/android/server/display/WifiDisplayAdapter.java +++ b/services/core/java/com/android/server/display/WifiDisplayAdapter.java @@ -91,6 +91,10 @@ 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, @@ -432,7 +436,8 @@ final class WifiDisplayAdapter extends DisplayAdapter { } // 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() { |