Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sensor triggering issue" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-13 00:24:14 +00:00
committed by Android (Google) Code Review
parent fa38ed5296 cf06eb3a92
commit fba4296329
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
View File

@@ -292,6 +292,7 @@ public class DozeSensors {
final AlarmTimeout mCooldownTimer; final AlarmTimeout mCooldownTimer;
final AlwaysOnDisplayPolicy mPolicy; final AlwaysOnDisplayPolicy mPolicy;
final Sensor mSensor; final Sensor mSensor;
final boolean mUsingBrightnessSensor;
public ProxSensor(AlwaysOnDisplayPolicy policy) { public ProxSensor(AlwaysOnDisplayPolicy policy) {
mPolicy = policy; mPolicy = policy;
@@ -302,6 +303,7 @@ public class DozeSensors {
// if available. // if available.
Sensor sensor = DozeSensors.findSensorWithType(mSensorManager, Sensor sensor = DozeSensors.findSensorWithType(mSensorManager,
mContext.getString(R.string.doze_brightness_sensor_type)); mContext.getString(R.string.doze_brightness_sensor_type));
mUsingBrightnessSensor = sensor != null;
if (sensor == null) { if (sensor == null) {
sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
} }
@@ -331,8 +333,7 @@ public class DozeSensors {
return; return;
} }
if (register) { if (register) {
mRegistered = mSensorManager.registerListener(this, mRegistered = mSensorManager.registerListener(this, mSensor,
mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY),
SensorManager.SENSOR_DELAY_NORMAL, mHandler); SensorManager.SENSOR_DELAY_NORMAL, mHandler);
} else { } else {
mSensorManager.unregisterListener(this); mSensorManager.unregisterListener(this);
@@ -345,7 +346,13 @@ public class DozeSensors {
public void onSensorChanged(android.hardware.SensorEvent event) { public void onSensorChanged(android.hardware.SensorEvent event) {
if (DEBUG) Log.d(TAG, "onSensorChanged " + event); if (DEBUG) Log.d(TAG, "onSensorChanged " + event);
mCurrentlyFar = event.values[0] >= event.sensor.getMaximumRange(); if (mUsingBrightnessSensor) {
// The custom brightness sensor is gated by the proximity sensor and will return 0
// whenever prox is covered.
mCurrentlyFar = event.values[0] > 0;
} else {
mCurrentlyFar = event.values[0] >= event.sensor.getMaximumRange();
}
mProxCallback.accept(mCurrentlyFar); mProxCallback.accept(mCurrentlyFar);
long now = SystemClock.elapsedRealtime(); long now = SystemClock.elapsedRealtime();