Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev (e851fc58) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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
	*/		*/

+6 −1

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