Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1210)

Unified Diff: net/android/java/src/org/chromium/net/ProxyChangeListener.java

Issue 473613002: Fix proxy action name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/java/src/org/chromium/net/ProxyChangeListener.java
diff --git a/net/android/java/src/org/chromium/net/ProxyChangeListener.java b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
index 7b573968b38cf0750588e2d815b7d3c9ba665fbd..63bfb30514cae20a672e8526aa8a3d73919d3189 100644
--- a/net/android/java/src/org/chromium/net/ProxyChangeListener.java
+++ b/net/android/java/src/org/chromium/net/ProxyChangeListener.java
@@ -99,15 +99,19 @@ public class ProxyChangeListener {
try {
final String GET_HOST_NAME = "getHost";
final String GET_PORT_NAME = "getPort";
- Object props = intent.getExtras().get("proxy");
- if (props == null) {
- return null;
- }
String className;
+ String proxyInfo;
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
className = "android.net.ProxyProperties";
+ proxyInfo = "proxy";
} else {
className = "android.net.ProxyInfo";
+ proxyInfo = "android.intent.extra.PROXY_INFO";
+ }
+
+ Object props = intent.getExtras().get(proxyInfo);
+ if (props == null) {
+ return null;
}
Class<?> cls = Class.forName(className);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698