Adds synchronization around message handler in GeolocationPermissions and WebStorage

The message handler is instantiated on the WebCore thread and its presence is
checked on the browser thread. This requires synchronization.

Change-Id: I4b71c7a2470b60fa273dc2bcb46f645ed135ee11

2 files changed, 4 insertions, 4 deletions

diff --git a/core/java/android/webkit/GeolocationPermissions.java b/core/java/android/webkit/GeolocationPermissions.java
index d12d828..817fb3c 100755
--- a/core/java/android/webkit/GeolocationPermissions.java
+++ b/core/java/android/webkit/GeolocationPermissions.java
@@ -126,7 +126,7 @@ public final class GeolocationPermissions {
      * Creates the message handler. Must be called on the WebKit thread.
      * @hide
      */
-    public void createHandler() {
+    public synchronized void createHandler() {
         if (mHandler == null) {
             mHandler = new Handler() {
                 @Override
@@ -180,7 +180,7 @@ public final class GeolocationPermissions {
     /**
      * Utility function to send a message to our handler.
      */
-    private void postMessage(Message msg) {
+    private synchronized void postMessage(Message msg) {
         assert(mHandler != null);
         mHandler.sendMessage(msg);
     }
diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java
index cf71a84..9314d7b 100644
--- a/core/java/android/webkit/WebStorage.java
+++ b/core/java/android/webkit/WebStorage.java
@@ -146,7 +146,7 @@ public final class WebStorage {
      * @hide
      * Message handler, webcore side
      */
-    public void createHandler() {
+    public synchronized void createHandler() {
         if (mHandler == null) {
             mHandler = new Handler() {
                 @Override
@@ -342,7 +342,7 @@ public final class WebStorage {
     /**
      * Utility function to send a message to our handler
      */
-    private void postMessage(Message msg) {
+    private synchronized void postMessage(Message msg) {
         if (mHandler != null) {
             mHandler.sendMessage(msg);
         }