Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85521017 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 6bf296f6 0e164b19

core/java/android/content/Context.java

+4 −2
Original line number Diff line number Diff line
@@ -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.

wifi/java/android/net/wifi/WifiManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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>