commit fc309815886e9b4bf9d5dfb76a8c7cffe2ab1fd1
author Santos Cordon <santoscordon@google.com> Tue Aug 20 18:33:16 2013 -0700
committer Santos Cordon <santoscordon@google.com> Tue Aug 20 18:34:17 2013 -0700
tree d19a6b5b0adacc4ff963e336a492d0d24d71f058
parent 9611db789c6f4abd158a443bd92bfc78a21d49f7

Remove proximity sensor code from TeleService app.

This code is being moved to InCallUI in CL:
I5c2ea6daa9443e7ad77c67f272bc0bafdb060e5e

bug: 10366512
Change-Id: I77e0d15ad1a8f5a090c1368db98edaa246dbcd72

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 6900183..42c73ae 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -97,7 +97,7 @@
 
     private static final int BAD_EMERGENCY_NUMBER_DIALOG = 0;
 
-    private static final int USER_ACTIVITY_TIMEOUT_WHEN_NO_PROX_SENSOR = 15000; // millis
+    // private static final int USER_ACTIVITY_TIMEOUT_WHEN_NO_PROX_SENSOR = 15000; // millis
 
     EditText mDigits;
     private View mDialButton;
@@ -164,10 +164,11 @@
         // Allow this activity to be displayed in front of the keyguard / lockscreen.
         WindowManager.LayoutParams lp = getWindow().getAttributes();
         lp.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
-        if (!mApp.proximitySensorModeEnabled()) {
-            // When no proximity sensor is available, use a shorter timeout.
-            lp.userActivityTimeout = USER_ACTIVITY_TIMEOUT_WHEN_NO_PROX_SENSOR;
-        }
+
+        // When no proximity sensor is available, use a shorter timeout.
+        // TODO(klp): Do we enable this for non proximity devices any more?
+        // lp.userActivityTimeout = USER_ACTIVITY_TIMEOUT_WHEN_NO_PROX_SENSOR;
+
         getWindow().setAttributes(lp);
 
         setContentView(R.layout.emergency_dialer);