From 0e164b199ee33dbb1e9feeaa24c52231f9b81ac0 Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Mon, 8 Aug 2016 10:20:13 -0700 Subject: Document correct context for obtaining WifiManager Added comments to both WifiManager WIFI_SERVICE. Bug: 25015174 Change-Id: Ibd1e21d860ef2b7cc432b3da76671d22c02ef7cb --- core/java/android/content/Context.java | 6 ++++-- wifi/java/android/net/wifi/WifiManager.java | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 3f18ea91c99a..f908abcc7ebd 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2761,8 +2761,10 @@ public abstract class Context { *
A {@link android.net.ConnectivityManager ConnectivityManager} for * handling management of network connections. *
{@link #WIFI_SERVICE} ("wifi") - *
A {@link android.net.wifi.WifiManager WifiManager} for management of - * Wi-Fi connectivity. + *
A {@link android.net.wifi.WifiManager WifiManager} for management of Wi-Fi + * connectivity. On releases before NYC, it should only be obtained from an application + * context, and not from any other derived context to avoid memory leaks within the calling + * process. *
{@link #WIFI_P2P_SERVICE} ("wifip2p") *
A {@link android.net.wifi.p2p.WifiP2pManager WifiP2pManager} for management of * Wi-Fi Direct connectivity. diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index bbc3d2fd5927..1633bd9c914a 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -49,6 +49,8 @@ import java.util.concurrent.CountDownLatch; * This class provides the primary API for managing all aspects of Wi-Fi * connectivity. Get an instance of this class by calling * {@link android.content.Context#getSystemService(String) Context.getSystemService(Context.WIFI_SERVICE)}. + * On releases before NYC, it should only be obtained from an application context, and not from + * any other derived context to avoid memory leaks within the calling process. * It deals with several categories of items: *