summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--java/com/android/incallui/InCallPresenter.java4
-rw-r--r--java/com/android/incallui/ProximitySensor.java5
2 files changed, 6 insertions, 3 deletions
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 64bc4048c..0dd654903 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -852,7 +852,7 @@ public class InCallPresenter implements CallList.Listener {
if (newState == InCallState.NO_CALLS) {
if (mBoundAndWaitingForOutgoingCall) {
- return InCallState.OUTGOING;
+ return InCallState.PENDING_OUTGOING;
}
}
@@ -870,7 +870,7 @@ public class InCallPresenter implements CallList.Listener {
mBoundAndWaitingForOutgoingCall = isBound;
mThemeColorManager.setPendingPhoneAccountHandle(handle);
if (isBound && mInCallState == InCallState.NO_CALLS) {
- mInCallState = InCallState.OUTGOING;
+ mInCallState = InCallState.PENDING_OUTGOING;
}
}
diff --git a/java/com/android/incallui/ProximitySensor.java b/java/com/android/incallui/ProximitySensor.java
index 653d85be9..db538abdc 100644
--- a/java/com/android/incallui/ProximitySensor.java
+++ b/java/com/android/incallui/ProximitySensor.java
@@ -102,7 +102,10 @@ public class ProximitySensor
// sensor during incoming call screen. We check hasLiveCall() because a disconnected call
// can also put the in-call screen in the INCALL state.
boolean hasOngoingCall = InCallState.INCALL == newState && callList.hasLiveCall();
- boolean isOffhook = (InCallState.OUTGOING == newState) || hasOngoingCall;
+ boolean isOffhook =
+ InCallState.PENDING_OUTGOING == newState
+ || InCallState.OUTGOING == newState
+ || hasOngoingCall;
DialerCall activeCall = callList.getActiveCall();
boolean isVideoCall = activeCall != null && activeCall.isVideoCall();