Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document correct context for obtaining WifiManager am: 0e164b199e

Browse Source 
am: b09557b3cf

Change-Id: I792d164a20e2e98fc58b54bab4f1f43e1eb2fe59
This commit is contained in:
Paul Stewart
2016-08-26 18:01:53 +00:00
committed by android-build-merger
parent 99b8ff8b7d b09557b3cf
commit 163a135246
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/Context.java
View File

@@ -2761,8 +2761,10 @@ public abstract class Context {
* <dd> A {@link android.net.ConnectivityManager ConnectivityManager} for * <dd> A {@link android.net.ConnectivityManager ConnectivityManager} for
* handling management of network connections. * handling management of network connections.
* <dt> {@link #WIFI_SERVICE} ("wifi") * <dt> {@link #WIFI_SERVICE} ("wifi")
* <dd> A {@link android.net.wifi.WifiManager WifiManager} for management of * <dd> A {@link android.net.wifi.WifiManager WifiManager} for management of Wi-Fi
* Wi-Fi connectivity. * 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.
* <dt> {@link #WIFI_P2P_SERVICE} ("wifip2p") * <dt> {@link #WIFI_P2P_SERVICE} ("wifip2p")
* <dd> A {@link android.net.wifi.p2p.WifiP2pManager WifiP2pManager} for management of * <dd> A {@link android.net.wifi.p2p.WifiP2pManager WifiP2pManager} for management of
* Wi-Fi Direct connectivity. * Wi-Fi Direct connectivity.

2
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -49,6 +49,8 @@ import java.util.concurrent.CountDownLatch;
* This class provides the primary API for managing all aspects of Wi-Fi * This class provides the primary API for managing all aspects of Wi-Fi
* connectivity. Get an instance of this class by calling * connectivity. Get an instance of this class by calling
* {@link android.content.Context#getSystemService(String) Context.getSystemService(Context.WIFI_SERVICE)}. * {@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: * It deals with several categories of items:
* <ul> * <ul>