summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/java/android/webkit/GoogleLocationSettingManager.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/GoogleLocationSettingManager.java b/core/java/android/webkit/GoogleLocationSettingManager.java
index 1b6e77c..508df3b 100644
--- a/core/java/android/webkit/GoogleLocationSettingManager.java
+++ b/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);
+ }
}
}
}