am 5d062bc3: Merge change 27426 into eclair

Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp

* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
  Handle the case where GoogleLocationSettingObserver::onChange

core/java/android/webkit/GoogleLocationSettingManager.java

@@ -200,7 +200,11 @@ class GoogleLocationSettingManager {
 
         @Override
         public void onChange(boolean selfChange) {
-            maybeApplySetting(mContext);
+            // This may come after the call to doNotObserve() above,
+            // so mContext may be null.
+            if (mContext != null) {
+                maybeApplySetting(mContext);
+            }
         }
     }
 }