commit c4374a43d6bd8940af9890e2121e6571da07910f
author Michael Wright <michaelwr@google.com> Thu Aug 28 00:00:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 00:00:44 2014 +0000
tree f8c18d2af0ac30dbc25f86eb5ea53c077c5eecf7
parent c35ea27a7fba02da2e40253c69ad4a07ded09c2e
parent 3e048a7165184dae9092a46056aba045bcb00f27

Merge "Change constant to PowerManager.WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev

src/com/android/telecomm/ProximitySensorManager.java

diff --git a/src/com/android/telecomm/ProximitySensorManager.java b/src/com/android/telecomm/ProximitySensorManager.java
index c6b018a..287c6d4 100644
--- a/src/com/android/telecomm/ProximitySensorManager.java
+++ b/src/com/android/telecomm/ProximitySensorManager.java
@@ -74,7 +74,7 @@
         if (mProximityWakeLock.isHeld()) {
             Log.i(this, "Releasing proximity wake lock");
             int flags =
-                (screenOnImmediately ? 0 : PowerManager.WAIT_FOR_PROXIMITY_NEGATIVE);
+                (screenOnImmediately ? 0 : PowerManager.WAIT_FOR_DISTANT_PROXIMITY);
             mProximityWakeLock.release(flags);
         } else {
             Log.i(this, "Proximity wake lock already released");