Merge cherrypicks of [15313376] into security-aosp-rvc-release (54a83a83) · Commits · e / os / android_frameworks_base

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
		*/

+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() {