diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-04-11 21:11:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-11 21:11:44 +0000 |
| commit | ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a (patch) | |
| tree | 08c77b20358321f4f2aed91aa7a23ed5ff0034fd /core/java/android | |
| parent | c65e463356e9c8b646e80d0bfb6cfc76a0a1b426 (diff) | |
| parent | a9bebc221108dd679da0557963605cd704d05743 (diff) | |
Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 4e4980d557c5..78bf9afcbb40 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -1136,7 +1136,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#CHANGE_NETWORK_STATE}. + * {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}. * {@hide} */ public void setGlobalProxy(ProxyProperties p) { |