commit d486375c148b54be209468d83311b981ef3258cc
author Kristian Monsen <kristianm@google.com> Thu Dec 23 07:35:40 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 23 07:35:40 2010 -0800
tree da4434b2293691940f2cdd8e16484674e7268d21
parent 113ec8d41ba9e0be2cd1349efc2047c61ae3a3a4
parent 6b91b45e3151bf07d761939694c18158e4eed4fe

Merge "Only store Application context"

core/java/android/webkit/JniUtil.java

diff --git a/core/java/android/webkit/JniUtil.java b/core/java/android/webkit/JniUtil.java
index ca3515c5..704d4da 100644
--- a/core/java/android/webkit/JniUtil.java
+++ b/core/java/android/webkit/JniUtil.java
@@ -39,7 +39,7 @@
         if (initialized)
             return;
 
-        sContext = context;
+        sContext = context.getApplicationContext();
         initialized = true;
     }
 

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 8e4852a..685b7ba 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1005,7 +1005,7 @@
     private static void setupProxyListener(Context context) {
         IntentFilter filter = new IntentFilter();
         filter.addAction(Proxy.PROXY_CHANGE_ACTION);
-        Intent currentProxy = context.registerReceiver(new ProxyReceiver(), filter);
+        Intent currentProxy = context.getApplicationContext().registerReceiver(new ProxyReceiver(), filter);
         if (currentProxy != null) {
             handleProxyBroadcast(currentProxy);
         }