diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-15 00:42:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-15 00:42:46 -0800 |
| commit | 30cb5c3ffa259f2a6df02a81a766c716477f4b92 (patch) | |
| tree | 31af3313ad5360a79ac4bdf6df7b49236d83822a /core/java/android/hardware | |
| parent | 0b342cf8da9feb8c4f1df96b83127bf009e6f96f (diff) | |
| parent | 2ea480cac89460ee2524cd080e90f6240e8eebf5 (diff) | |
| download | frameworks_base-30cb5c3ffa259f2a6df02a81a766c716477f4b92.zip frameworks_base-30cb5c3ffa259f2a6df02a81a766c716477f4b92.tar.gz frameworks_base-30cb5c3ffa259f2a6df02a81a766c716477f4b92.tar.bz2 | |
am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '2ea480cac89460ee2524cd080e90f6240e8eebf5':
Disallow applications from initiating cast screen.
Diffstat (limited to 'core/java/android/hardware')
| -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. |