diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2021-04-01 02:40:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 02:40:12 +0000 |
| commit | cd05cf4aa704b7e588d0b0f84c0fbd6b9c4e7b2b (patch) | |
| tree | dcfbceb01eefc674bde4dbc0458f122f5ee9809a | |
| parent | 21f28e69e132e2db12c879d93686f68b3293d330 (diff) | |
| parent | 3d6cf521c1a062ed0a009fce466b5069a9cd9192 (diff) | |
| download | base-cd05cf4aa704b7e588d0b0f84c0fbd6b9c4e7b2b.tar.gz | |
Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-dev am: 3d6cf521c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824717
Change-Id: I0e02f1d3d7ab499b605354725792a02c0749aec9
| -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 a2400fd3e22a..b5ffafa25032 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() { |