Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including EXTRA_LINK_PROPERTIES" into rvc-qpr-dev am: f535f0a044

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

Change-Id: I044190a45ee1971633bd6eb62e3d5a77078ceb5f
This commit is contained in:
David Su
2020-09-29 17:58:28 +00:00
committed by Automerger Merge Worker

View File

@@ -1054,8 +1054,8 @@ public class WifiManager {
/** /**
* Broadcast intent action indicating that the link configuration changed on wifi. * Broadcast intent action indicating that the link configuration changed on wifi.
* <br />Included Extras: * <br />Included Extras:
* <br />{@link #EXTRA_LINK_PROPERTIES}: {@link android.net.LinkProperties} object associated * <br />{@link #EXTRA_LINK_PROPERTIES}: may not be set starting in Android 11. Check for
* with the Wi-Fi network. * <br /> null before reading its value.
* <br /> No permissions are required to listen to this broadcast. * <br /> No permissions are required to listen to this broadcast.
* @hide * @hide
*/ */
@@ -1071,6 +1071,10 @@ public class WifiManager {
* Included in the {@link #ACTION_LINK_CONFIGURATION_CHANGED} broadcast. * Included in the {@link #ACTION_LINK_CONFIGURATION_CHANGED} broadcast.
* *
* Retrieve with {@link android.content.Intent#getParcelableExtra(String)}. * Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.
*
* Note: this extra may not be set starting in Android 11. Check for null before reading its
* value.
*
* @hide * @hide
*/ */
@SystemApi @SystemApi