Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17d1be8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into... 

Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev am: 30c6383d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287612

Change-Id: I2fba182703b7e2362a0cd0934903c6a2af849751
parents 1fed8e5b 30c6383d

core/java/android/hardware/display/DisplayManager.java

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ 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

     */

services/core/java/com/android/server/display/WifiDisplayAdapter.java

+1 −6
Original line number Diff line number Diff line
@@ -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() {