commit cfe34ea27689e0554d583dbd0cf39ef1ee83b6ed
author Michael Wright <michaelwr@google.com> Fri Sep 12 00:23:39 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 12 00:23:39 2014 +0000
tree 312c4b76f2794d85e02773e4442423ae764f0796
parent 5be64bc46c23b614d5452ca398a6bb7a512f1887
parent 6c801474048dffe3be4ed44f06667daa3aae03a9

Merge "Change constant to PowerManager.RELEASE_FLAG_WAIT_FOR_NO_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 7b8773d..1fabd66 100644
--- a/src/com/android/telecomm/ProximitySensorManager.java
+++ b/src/com/android/telecomm/ProximitySensorManager.java
@@ -79,7 +79,7 @@
         if (mProximityWakeLock.isHeld()) {
             Log.i(this, "Releasing proximity wake lock");
             int flags =
-                (screenOnImmediately ? 0 : PowerManager.WAIT_FOR_DISTANT_PROXIMITY);
+                (screenOnImmediately ? 0 : PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY);
             mProximityWakeLock.release(flags);
         } else {
             Log.i(this, "Proximity wake lock already released");