Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb484804 authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "In DeviceMotionService, handle the fact that we may receive updates... 

Merge "In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering."
parents e096f9fa d09001fe

core/java/android/webkit/DeviceMotionService.java

+6 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ final class DeviceMotionService implements SensorEventListener { 
        mUpdateRunnable = new Runnable() {

            @Override

            public void run() {

                assert mIsRunning;

                mManager.onMotionChange(new Double(mLastAcceleration[0]),

                        new Double(mLastAcceleration[1]), new Double(mLastAcceleration[2]),

                        INTERVAL_MILLIS);
@@ -157,6 +158,11 @@ final class DeviceMotionService implements SensorEventListener { 
        assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());

        assert(event.sensor.getType() == Sensor.TYPE_ACCELEROMETER);



        // We may get callbacks after the call to getSensorManager().unregisterListener() returns.

        if (!mIsRunning) {

            return;

        }



        boolean firstData = mLastAcceleration == null;

        mLastAcceleration = event.values;

        if (firstData) {

core/java/android/webkit/DeviceOrientationService.java

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ final class DeviceOrientationService implements SensorEventListener { 
        assert(event.values.length == 3);

        assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());



        // We may get callbacks after the call to getSensorManager().unregisterListener() returns.

        if (!mIsRunning) {

            return;

        }