| Index: content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java b/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
|
| index 2d4a4c79fd0d6a04631029265a6aae0b8a1573a4..64efbb72270dba3a4d957fa75fda1aac81efbd53 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java
|
| @@ -686,8 +686,16 @@ class DeviceSensors implements SensorEventListener {
|
| @Override
|
| public void unregisterListener(SensorEventListener listener, int sensorType) {
|
| List<Sensor> sensors = mSensorManager.getSensorList(sensorType);
|
| - if (!sensors.isEmpty()) {
|
| + if (sensors.isEmpty()) {
|
| + return;
|
| + }
|
| + try {
|
| mSensorManager.unregisterListener(listener, sensors.get(0));
|
| + } catch (IllegalArgumentException e) {
|
| + // Suppress occasional exception on Digma iDxD* devices:
|
| + // Receiver not registered: android.hardware.SystemSensorManager$1
|
| + // See crbug.com/596453.
|
| + Log.w(TAG, "Failed to unregister device sensor " + sensors.get(0).getName());
|
| }
|
| }
|
| }
|
|
|