Use proximity wake lock in InCallUI
Bug: 20160495
Change-Id: I821de3968e3dd825c2adc90a3339ee3ebec93e45
diff --git a/InCallUI/src/com/android/incallui/ProximitySensor.java b/InCallUI/src/com/android/incallui/ProximitySensor.java
index 5b9a5ec..7732c63 100644
--- a/InCallUI/src/com/android/incallui/ProximitySensor.java
+++ b/InCallUI/src/com/android/incallui/ProximitySensor.java
@@ -24,6 +24,7 @@
import com.android.incallui.AudioModeProvider.AudioModeListener;
import com.android.incallui.InCallPresenter.InCallState;
import com.android.incallui.InCallPresenter.InCallStateListener;
+
import com.google.common.base.Objects;
/**
@@ -40,6 +41,7 @@
private static final String TAG = ProximitySensor.class.getSimpleName();
private final PowerManager mPowerManager;
+ private final PowerManager.WakeLock mProximityWakeLock;
private final AudioModeProvider mAudioModeProvider;
private final AccelerometerListener mAccelerometerListener;
private int mOrientation = AccelerometerListener.ORIENTATION_UNKNOWN;
@@ -53,6 +55,13 @@
public ProximitySensor(Context context, AudioModeProvider audioModeProvider) {
mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+ if (mPowerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
+ mProximityWakeLock = mPowerManager.newWakeLock(
+ PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG);
+ } else {
+ Log.w(TAG, "Device does not support proximity wake lock.");
+ mProximityWakeLock = null;
+ }
mAccelerometerListener = new AccelerometerListener(context, this);
mAudioModeProvider = audioModeProvider;
mAudioModeProvider.addListener(this);
@@ -63,7 +72,7 @@
mAccelerometerListener.enable(false);
- TelecomAdapter.getInstance().turnOffProximitySensor(true);
+ turnOffProximitySensor(true);
}
/**
@@ -151,6 +160,30 @@
return !mPowerManager.isScreenOn();
}
+ private void turnOnProximitySensor() {
+ if (mProximityWakeLock != null) {
+ if (!mProximityWakeLock.isHeld()) {
+ Log.i(this, "Acquiring proximity wake lock");
+ mProximityWakeLock.acquire();
+ } else {
+ Log.i(this, "Proximity wake lock already acquired");
+ }
+ }
+ }
+
+ private void turnOffProximitySensor(boolean screenOnImmediately) {
+ if (mProximityWakeLock != null) {
+ if (mProximityWakeLock.isHeld()) {
+ Log.i(this, "Releasing proximity wake lock");
+ int flags =
+ (screenOnImmediately ? 0 : PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY);
+ mProximityWakeLock.release(flags);
+ } else {
+ Log.i(this, "Proximity wake lock already released");
+ }
+ }
+ }
+
/**
* Updates the wake lock used to control proximity sensor behavior,
* based on the current state of the phone.
@@ -210,12 +243,12 @@
Log.d(this, "Turning on proximity sensor");
// Phone is in use! Arrange for the screen to turn off
// automatically when the sensor detects a close object.
- TelecomAdapter.getInstance().turnOnProximitySensor();
+ turnOnProximitySensor();
} else {
Log.d(this, "Turning off proximity sensor");
// Phone is either idle, or ringing. We don't want any special proximity sensor
// behavior in either case.
- TelecomAdapter.getInstance().turnOffProximitySensor(screenOnImmediately);
+ turnOffProximitySensor(screenOnImmediately);
}
}
}
diff --git a/InCallUI/src/com/android/incallui/TelecomAdapter.java b/InCallUI/src/com/android/incallui/TelecomAdapter.java
index 25813f2..10c2307 100644
--- a/InCallUI/src/com/android/incallui/TelecomAdapter.java
+++ b/InCallUI/src/com/android/incallui/TelecomAdapter.java
@@ -130,22 +130,6 @@
}
}
- void turnOnProximitySensor() {
- if (mPhone != null) {
- mPhone.setProximitySensorOn();
- } else {
- Log.e(this, "error setProximitySensorOn, mPhone is null");
- }
- }
-
- void turnOffProximitySensor(boolean screenOnImmediately) {
- if (mPhone != null) {
- mPhone.setProximitySensorOff(screenOnImmediately);
- } else {
- Log.e(this, "error setProximitySensorOff, mPhone is null");
- }
- }
-
void separateCall(String callId) {
if (mPhone != null) {
getTelecommCallById(callId).splitFromConference();