Merge change 27426 into eclair

* changes:
  Handle the case where GoogleLocationSettingObserver::onChange is called after GoogleLocationSettingObserver::doNotObserve().

core/java/android/webkit/GoogleLocationSettingManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,11 @@ class GoogleLocationSettingManager {

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