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

This reverts commit 012e415ff186ac49ba622d98bc991ffac14bbc5d.

Change-Id: Ib12d7a0f1185ffa9e32d1283466b653d9d3c69d7
(cherry picked from commit 7948c5a2c13212096ff887404f8722a1d7e43bd8)

1 files changed, 3 insertions, 9 deletions

diff --git a/src/com/android/incallui/ProximitySensor.java b/src/com/android/incallui/ProximitySensor.java
index 65dae8e1..ed3dfee5 100644
--- a/src/com/android/incallui/ProximitySensor.java
+++ b/src/com/android/incallui/ProximitySensor.java
@@ -47,7 +47,6 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener,
     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;
@@ -96,7 +95,6 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener,
         // 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;
@@ -106,10 +104,6 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener,
 
             updateProximitySensorMode();
         }
-
-        if (mHasIncomingCall) {
-            updateProximitySensorMode();
-        }
     }
 
     @Override
@@ -224,15 +218,15 @@ public class ProximitySensor implements AccelerometerListener.ChangeListener,
                     .add("aud", AudioState.audioRouteToString(audioMode))
                     .toString());
 
-            if ((mIsPhoneOffhook || mHasIncomingCall) && !screenOnImmediately) {
+            if (mIsPhoneOffhook && !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 idle.  We don't want any special proximity sensor
-                // behavior in this case.
+                // Phone is either idle, or ringing.  We don't want any special proximity sensor
+                // behavior in either case.
                 TelecomAdapter.getInstance().turnOffProximitySensor(screenOnImmediately);
             }
         }