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

Merge "Use binned brightness sensor instead of prox" into qt-dev

Browse Source 
am: cdc566dfd6

Change-Id: I85007cffbac76c4cf9e66228ec3abfd4c8e8067d
This commit is contained in:
Lucas Dupin
2019-07-19 17:34:17 -07:00
committed by android-build-merger
parent 17e4063de9 cdc566dfd6
commit 6fa0743097
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.systemui.R;
import com.android.systemui.plugins.SensorManagerPlugin; import com.android.systemui.plugins.SensorManagerPlugin;
import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.util.AlarmTimeout; import com.android.systemui.util.AlarmTimeout;
@@ -290,12 +291,21 @@ public class DozeSensors {
long mLastNear; long mLastNear;
final AlarmTimeout mCooldownTimer; final AlarmTimeout mCooldownTimer;
final AlwaysOnDisplayPolicy mPolicy; final AlwaysOnDisplayPolicy mPolicy;
final Sensor mSensor;
public ProxSensor(AlwaysOnDisplayPolicy policy) { public ProxSensor(AlwaysOnDisplayPolicy policy) {
mPolicy = policy; mPolicy = policy;
mCooldownTimer = new AlarmTimeout(mAlarmManager, this::updateRegistered, mCooldownTimer = new AlarmTimeout(mAlarmManager, this::updateRegistered,
"prox_cooldown", mHandler); "prox_cooldown", mHandler);
// The default prox sensor can be noisy, so let's use a prox gated brightness sensor
// if available.
Sensor sensor = DozeSensors.findSensorWithType(mSensorManager,
mContext.getString(R.string.doze_brightness_sensor_type));
if (sensor == null) {
sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
}
mSensor = sensor;
} }
void setRequested(boolean requested) { void setRequested(boolean requested) {
@@ -359,8 +369,9 @@ public class DozeSensors {
@Override @Override
public String toString() { public String toString() {
return String.format("{registered=%s, requested=%s, coolingDown=%s, currentlyFar=%s}", return String.format("{registered=%s, requested=%s, coolingDown=%s, currentlyFar=%s,"
mRegistered, mRequested, mCooldownTimer.isScheduled(), mCurrentlyFar); + " sensor=%s}", mRegistered, mRequested, mCooldownTimer.isScheduled(),
mCurrentlyFar, mSensor);
} }
} }