Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb4fc58c authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add telecom event for skip ringing." am: a780c6ed am: 6bb2ec13

am: f1f9f7e5

Change-Id: I5b074bfd924c40d3eb3c3dc361d9c7552f4f1d35
parents 9cd275f2 f1f9f7e5
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class Ringer {

        if (endEarly) {
            if (letDialerHandleRinging) {
                Log.addEvent(foregroundCall, LogUtils.Events.SKIP_RINGING);
                Log.addEvent(foregroundCall, LogUtils.Events.SKIP_RINGING, "Dialer handles");
            }
            Log.i(this, "Ending early -- isTheaterModeOn=%s, letDialerHandleRinging=%s, " +
                    "isSelfManaged=%s, hasExternalRinger=%s", isTheaterModeOn,
@@ -200,9 +200,11 @@ public class Ringer {
            mRingtonePlayer.play(mRingtoneFactory, foregroundCall);
            effect = getVibrationEffectForCall(mRingtoneFactory, foregroundCall);
        } else {
            Log.i(this, "startRinging: skipping because ringer would not be audible. " +
            String reason = String.format(
                    "isVolumeOverZero=%s, shouldRingForContact=%s, isRingtonePresent=%s",
                    isVolumeOverZero, shouldRingForContact, isRingtonePresent);
            Log.i(this, "startRinging: skipping because ringer would not be audible. " + reason);
            Log.addEvent(foregroundCall, LogUtils.Events.SKIP_RINGING, "Inaudible: " + reason);
            effect = mDefaultVibrationEffect;
        }

@@ -236,7 +238,7 @@ public class Ringer {
        }

        if (mInCallController.doesConnectedDialerSupportRinging()) {
            Log.addEvent(call, LogUtils.Events.SKIP_RINGING);
            Log.addEvent(call, LogUtils.Events.SKIP_RINGING, "Dialer handles");
            return;
        }