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

Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-26 17:50:18 +00:00
committed by Android (Google) Code Review
parent 6bf296f6dc 0e164b199e
commit 855210170c
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
* handling management of network connections.
* <dt> {@link #WIFI_SERVICE} ("wifi")
* <dd> A {@link android.net.wifi.WifiManager WifiManager} for management of
* Wi-Fi connectivity.
* <dd> 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.
* <dt> {@link #WIFI_P2P_SERVICE} ("wifip2p")
* <dd> A {@link android.net.wifi.p2p.WifiP2pManager WifiP2pManager} for management of
* 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
* 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:
* <ul>