diff options
| -rw-r--r-- | src/com/android/incallui/ProximitySensor.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/incallui/ProximitySensor.java b/src/com/android/incallui/ProximitySensor.java index 5a401d28..5bc7f09a 100644 --- a/src/com/android/incallui/ProximitySensor.java +++ b/src/com/android/incallui/ProximitySensor.java @@ -26,6 +26,7 @@ import android.hardware.SensorEventListener; import android.hardware.SensorManager; import android.os.Handler; import android.os.PowerManager; +import android.provider.Settings; import android.telecom.CallAudioState; import android.view.Display; @@ -48,6 +49,8 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener, InCallStateListener, AudioModeListener, SensorEventListener { private static final String TAG = ProximitySensor.class.getSimpleName(); + private static final String PROXIMITY_SENSOR = "proximity_sensor"; + private final PowerManager mPowerManager; private final PowerManager.WakeLock mProximityWakeLock; private SensorManager mSensor; @@ -64,6 +67,7 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener, private boolean mIsProxSensorFar = true; private int mProxSpeakerDelay = 100; private boolean mDialpadVisible; + private Context mContext; private final Handler mHandler = new Handler(); private final Runnable mActivateSpeaker = new Runnable() { @@ -79,6 +83,7 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener, public ProximitySensor(Context context, AudioModeProvider audioModeProvider, AccelerometerListener accelerometerListener) { + mContext = context; mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); if (mPowerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) { @@ -303,6 +308,8 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener, || CallAudioState.ROUTE_SPEAKER == audioMode || CallAudioState.ROUTE_BLUETOOTH == audioMode || mIsHardKeyboardOpen); + screenOnImmediately |= Settings.System.getInt(mContext.getContentResolver(), + PROXIMITY_SENSOR, 1) == 0; // We do not keep the screen off when the user is outside in-call screen and we are // horizontal, but we do not force it on when we become horizontal until the |