diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-15 00:38:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-15 00:38:09 -0800 |
| commit | 5d0b18cddfcb933d7960c5a6a820045d77a0285c (patch) | |
| tree | a9c2398339e844568ae387cf4653e14872262f91 /core/java | |
| parent | 634fbcf8a3a367ef0abbc7a905411c7918281394 (diff) | |
| parent | 3de885bef2f0f85ea76fd96c8f18cdd743ce66a4 (diff) | |
| download | frameworks_base-5d0b18cddfcb933d7960c5a6a820045d77a0285c.zip frameworks_base-5d0b18cddfcb933d7960c5a6a820045d77a0285c.tar.gz frameworks_base-5d0b18cddfcb933d7960c5a6a820045d77a0285c.tar.bz2 | |
am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
Disallow applications from initiating cast screen.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/display/DisplayManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index f12be5f..d5208d9 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -299,6 +299,10 @@ public final class DisplayManager { /** * Initiates a fresh scan of availble Wifi displays. * The results are sent as a {@link #ACTION_WIFI_DISPLAY_STATUS_CHANGED} broadcast. + * <p> + * Requires {@link android.Manifest.permission#CONFIGURE_WIFI_DISPLAY}. + * </p> + * * @hide */ public void scanWifiDisplays() { @@ -312,8 +316,7 @@ public final class DisplayManager { * Automatically remembers the display after a successful connection, if not * already remembered. * </p><p> - * Requires {@link android.Manifest.permission#CONFIGURE_WIFI_DISPLAY} to connect - * to unknown displays. No permissions are required to connect to already known displays. + * Requires {@link android.Manifest.permission#CONFIGURE_WIFI_DISPLAY}. * </p> * * @param deviceAddress The MAC address of the device to which we should connect. |