diff options
Diffstat (limited to 'java/com/android/incallui/ringtone/DialerRingtoneManager.java')
-rw-r--r-- | java/com/android/incallui/ringtone/DialerRingtoneManager.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/java/com/android/incallui/ringtone/DialerRingtoneManager.java b/java/com/android/incallui/ringtone/DialerRingtoneManager.java index b8a3071cc..777133ef5 100644 --- a/java/com/android/incallui/ringtone/DialerRingtoneManager.java +++ b/java/com/android/incallui/ringtone/DialerRingtoneManager.java @@ -22,7 +22,7 @@ import android.provider.Settings; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.android.incallui.call.CallList; -import com.android.incallui.call.DialerCall.State; +import com.android.incallui.call.state.DialerCallState; import java.util.Objects; /** @@ -44,7 +44,7 @@ public class DialerRingtoneManager { * Creates the DialerRingtoneManager with the given {@link InCallTonePlayer}. * * @param inCallTonePlayer the tone player used to play in-call tones. - * @param callList the CallList used to check for {@link State#CALL_WAITING} + * @param callList the CallList used to check for {@link DialerCallState#CALL_WAITING} * @throws NullPointerException if inCallTonePlayer or callList are null */ public DialerRingtoneManager( @@ -54,8 +54,8 @@ public class DialerRingtoneManager { } /** - * Determines if a ringtone should be played for the given call state (see {@link State}) and - * {@link Uri}. + * Determines if a ringtone should be played for the given call state (see {@link + * DialerCallState}) and {@link Uri}. * * @param callState the call state for the call being checked. * @param ringtoneUri the ringtone to potentially play. @@ -63,7 +63,7 @@ public class DialerRingtoneManager { */ public boolean shouldPlayRingtone(int callState, @Nullable Uri ringtoneUri) { return isDialerRingingEnabled() - && translateCallStateForCallWaiting(callState) == State.INCOMING + && translateCallStateForCallWaiting(callState) == DialerCallState.INCOMING && ringtoneUri != null; } @@ -79,14 +79,16 @@ public class DialerRingtoneManager { } /** - * The incoming callState is never set as {@link State#CALL_WAITING} because {@link + * The incoming callState is never set as {@link DialerCallState#CALL_WAITING} because {@link * DialerCall#translateState(int)} doesn't account for that case, check for it here */ private int translateCallStateForCallWaiting(int callState) { - if (callState != State.INCOMING) { + if (callState != DialerCallState.INCOMING) { return callState; } - return callList.getActiveCall() == null ? State.INCOMING : State.CALL_WAITING; + return callList.getActiveCall() == null + ? DialerCallState.INCOMING + : DialerCallState.CALL_WAITING; } private boolean isDialerRingingEnabled() { @@ -97,14 +99,14 @@ public class DialerRingtoneManager { /** * Determines if a call waiting tone should be played for the the given call state (see {@link - * State}). + * DialerCallState}). * * @param callState the call state for the call being checked. * @return {@code true} if the call waiting tone should be played, {@code false} otherwise. */ public boolean shouldPlayCallWaitingTone(int callState) { return isDialerRingingEnabled() - && translateCallStateForCallWaiting(callState) == State.CALL_WAITING + && translateCallStateForCallWaiting(callState) == DialerCallState.CALL_WAITING && !inCallTonePlayer.isPlayingTone(); } |