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

Commit 6b5e3d7d authored by wangqi's avatar wangqi Committed by android-build-merger
Browse files

Merge "Add impression logging for RTT call" am: 4f60ea7b am: dcbbf7e9

am: 3fa86a68

Change-Id: I69db400897eaa472a60976687dcd1fbc77b6a7c4
parents fd471190 3fa86a68
Loading
Loading
Loading
Loading
+11 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ message DialerImpression {
  // Event enums to be used for Impression Logging in Dialer.
  // Event enums to be used for Impression Logging in Dialer.
  // It's perfectly acceptable for this enum to be large
  // It's perfectly acceptable for this enum to be large
  // Values should be from 1000 to 100000.
  // Values should be from 1000 to 100000.
  // Next Tag: 1382
  // Next Tag: 1387
  enum Type {
  enum Type {
    UNKNOWN_AOSP_EVENT_TYPE = 1000;
    UNKNOWN_AOSP_EVENT_TYPE = 1000;


@@ -754,5 +754,15 @@ message DialerImpression {
    // Failure happened while enabling spam blocking through after call
    // Failure happened while enabling spam blocking through after call
    // notification promo.
    // notification promo.
    SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_AFTER_CALL_NOTIFICATION_PROMO = 1381;
    SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_AFTER_CALL_NOTIFICATION_PROMO = 1381;

    // RTT call impressions
    OUTGOING_RTT_CALL = 1382;
    INCOMING_RTT_CALL = 1383;
    // The call turns into RTT call mid call.
    RTT_MID_CALL_ENABLED = 1384;
    // Mid call RTT request accepted.
    RTT_MID_CALL_ACCEPTED = 1385;
    // Mid call RTT request rejected.
    RTT_MID_CALL_REJECTED = 1386;
  }
  }
}
}
+14 −0
Original line number Original line Diff line number Diff line
@@ -213,8 +213,22 @@ public class CallList implements DialerCallDelegate {


    if (call.getState() == DialerCall.State.INCOMING
    if (call.getState() == DialerCall.State.INCOMING
        || call.getState() == DialerCall.State.CALL_WAITING) {
        || call.getState() == DialerCall.State.CALL_WAITING) {
      if (call.isActiveRttCall()) {
        Logger.get(context)
            .logCallImpression(
                DialerImpression.Type.INCOMING_RTT_CALL,
                call.getUniqueCallId(),
                call.getTimeAddedMs());
      }
      onIncoming(call);
      onIncoming(call);
    } else {
    } else {
      if (call.isActiveRttCall()) {
        Logger.get(context)
            .logCallImpression(
                DialerImpression.Type.OUTGOING_RTT_CALL,
                call.getUniqueCallId(),
                call.getTimeAddedMs());
      }
      onUpdateCall(call);
      onUpdateCall(call);
      notifyGenericListeners();
      notifyGenericListeners();
    }
    }
+14 −0
Original line number Original line Diff line number Diff line
@@ -312,6 +312,13 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
        @Override
        @Override
        public void onRttStatusChanged(Call call, boolean enabled, RttCall rttCall) {
        public void onRttStatusChanged(Call call, boolean enabled, RttCall rttCall) {
          LogUtil.v("TelecomCallCallback.onRttStatusChanged", "enabled=%b", enabled);
          LogUtil.v("TelecomCallCallback.onRttStatusChanged", "enabled=%b", enabled);
          if (enabled) {
            Logger.get(context)
                .logCallImpression(
                    DialerImpression.Type.RTT_MID_CALL_ENABLED,
                    getUniqueCallId(),
                    getTimeAddedMs());
          }
          update();
          update();
        }
        }


@@ -1064,6 +1071,13 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa


  @TargetApi(28)
  @TargetApi(28)
  public void respondToRttRequest(boolean accept, int rttRequestId) {
  public void respondToRttRequest(boolean accept, int rttRequestId) {
    Logger.get(context)
        .logCallImpression(
            accept
                ? DialerImpression.Type.RTT_MID_CALL_ACCEPTED
                : DialerImpression.Type.RTT_MID_CALL_REJECTED,
            getUniqueCallId(),
            getTimeAddedMs());
    getTelecomCall().respondToRttRequest(rttRequestId, accept);
    getTelecomCall().respondToRttRequest(rttRequestId, accept);
  }
  }