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

Commit fab01261 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix Docs breakage"

parents 7d3387bc faf3fd59

core/java/android/net/ConnectivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,7 @@ public class ConnectivityManager { 
     *        HTTP proxy.  A {@code null} value will clear the global HTTP proxy.

     *

     * <p>This method requires the call to hold the permission

     * {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}.

     * android.Manifest.permission#CONNECTIVITY_INTERNAL.

     */

    public void setGlobalProxy(ProxyInfo p) {

        try {