Fix device orientation handler on Android.

TEST=Attach to remote devtools debugger.  Add the following snippet to
     any page and see it prints values out.
window.addEventListener('deviceorientation', function(event) {
  var a = event.alpha;
  var b = event.beta;
  var g = event.gamma;
  console.log(a, b, g);
}, false);

BUG=160781

R=jcivelli@chromium.org,michaelbai@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11369254

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167798 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/content/public/android/java/src/org/chromium/content/browser/DeviceOrientation.java b/content/public/android/java/src/org/chromium/content/browser/DeviceOrientation.java
index ebbaa1a..4d8c3e7 100644
--- a/content/public/android/java/src/org/chromium/content/browser/DeviceOrientation.java
+++ b/content/public/android/java/src/org/chromium/content/browser/DeviceOrientation.java
@@ -29,7 +29,7 @@ class DeviceOrientation implements SensorEventListener {
     private Handler mHandler;
 
     // The lock to access the mHandler.
-  private Object mHandlerLock;
+    private Object mHandlerLock = new Object();
 
     // Non-zero if and only if we're listening for events.
     // To avoid race conditions on the C++ side, access must be synchronized.
@@ -229,7 +229,7 @@ class DeviceOrientation implements SensorEventListener {
             // Wait for the background thread to spin up.
             while (mHandler == null) {
                 try {
-                    wait();
+                    mHandlerLock.wait();
                 } catch (InterruptedException e) {
                     // Somebody doesn't want us to wait! That's okay, SensorManager accepts null.
                     return null;
@@ -242,7 +242,7 @@ class DeviceOrientation implements SensorEventListener {
     private void setHandler(Handler handler) {
         synchronized (mHandlerLock) {
             mHandler = handler;
-            notify();
+            mHandlerLock.notify();
         }
     }