diff options
author | David Su <dysu@google.com> | 2020-09-29 17:58:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-29 17:58:28 +0000 |
commit | e682f08235acbcb1cb67f6092d7d060f2f2cbd17 (patch) | |
tree | 3082f08ba7ce3a46bbf978f059d22618059e39ce /wifi | |
parent | bf3a18c28e827241d7a107f535d2d71ab0a15c5c (diff) | |
parent | f535f0a04461015aafdbdc43e9d85ea1f45f68c2 (diff) |
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
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index fb6af5b550b0..4a61db894b89 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1054,8 +1054,8 @@ public class WifiManager { /** * Broadcast intent action indicating that the link configuration changed on wifi. * <br />Included Extras: - * <br />{@link #EXTRA_LINK_PROPERTIES}: {@link android.net.LinkProperties} object associated - * with the Wi-Fi network. + * <br />{@link #EXTRA_LINK_PROPERTIES}: may not be set starting in Android 11. Check for + * <br /> null before reading its value. * <br /> No permissions are required to listen to this broadcast. * @hide */ @@ -1071,6 +1071,10 @@ public class WifiManager { * Included in the {@link #ACTION_LINK_CONFIGURATION_CHANGED} broadcast. * * 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 */ @SystemApi |