[2/2] InCallUI: let InCallUI handle proximity sensor for incoming calls

fixes "while 'prevent accidental wake-up' is on, proximity sensor
        doesn't control screen state on incoming call.  must manually
        turn on screen to see who's calling."

Change-Id: I91729adc9d49f30d9340e91259638687ca6ab50a

1 files changed, 9 insertions, 3 deletions

diff --git a/src/com/android/incallui/ProximitySensor.java b/src/com/android/incallui/ProximitySensor.java
index f32bee9d..6acdf914 100644
--- a/src/com/android/incallui/ProximitySensor.java
+++ b/src/com/android/incallui/ProximitySensor.java
@@ -47,6 +47,7 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene
     private final AccelerometerListener mAccelerometerListener;
     private int mOrientation = AccelerometerListener.ORIENTATION_UNKNOWN;
     private boolean mUiShowing = false;
+    private boolean mHasIncomingCall = false;
     private boolean mIsPhoneOffhook = false;
     private boolean mDialpadVisible;
     private Context mContext;
@@ -90,6 +91,7 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene
         // can also put the in-call screen in the INCALL state.
         boolean hasOngoingCall = InCallState.INCALL == newState && callList.hasLiveCall();
         boolean isOffhook = (InCallState.OUTGOING == newState) || hasOngoingCall;
+        mHasIncomingCall = (InCallState.INCOMING == newState);
 
         if (isOffhook != mIsPhoneOffhook) {
             mIsPhoneOffhook = isOffhook;
@@ -99,6 +101,10 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene
 
             updateProximitySensorMode();
         }
+
+        if (mHasIncomingCall) {
+            updateProximitySensorMode();
+        }
     }
 
     @Override
@@ -213,15 +219,15 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene
                     .add("aud", AudioState.audioRouteToString(audioMode))
                     .toString());
 
-            if (mIsPhoneOffhook && !screenOnImmediately) {
+            if ((mIsPhoneOffhook || mHasIncomingCall) && !screenOnImmediately) {
                 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();
             } 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.
+                // Phone is idle.  We don't want any special proximity sensor
+                // behavior in this case.
                 TelecomAdapter.getInstance().turnOffProximitySensor(screenOnImmediately);
             }
         }