Merge "API Review: CallQuality.Builder"

2 files changed, 27 insertions, 21 deletions

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 584abc92d56d..297239a070f4 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -12402,7 +12402,7 @@ package android.telephony {
     method public int getNumRtpPacketsReceived();
     method public int getNumRtpPacketsTransmitted();
     method public int getNumRtpPacketsTransmittedLost();
-    method public int getNumRtpSidPacketsRx();
+    method public int getNumRtpSidPacketsReceived();
     method public int getNumVoiceFrames();
     method public int getUplinkCallQualityLevel();
     method public boolean isIncomingSilenceDetectedAtCallSetup();
@@ -12422,8 +12422,8 @@ package android.telephony {
     ctor public CallQuality.Builder();
     method @NonNull public android.telephony.CallQuality build();
     method @NonNull public android.telephony.CallQuality.Builder setAverageRelativeJitter(int);
-    method @NonNull public android.telephony.CallQuality.Builder setAverageRoundTripTime(int);
-    method @NonNull public android.telephony.CallQuality.Builder setCallDuration(int);
+    method @NonNull public android.telephony.CallQuality.Builder setAverageRoundTripTimeMillis(int);
+    method @NonNull public android.telephony.CallQuality.Builder setCallDurationMillis(int);
     method @NonNull public android.telephony.CallQuality.Builder setCodecType(int);
     method @NonNull public android.telephony.CallQuality.Builder setDownlinkCallQualityLevel(int);
     method @NonNull public android.telephony.CallQuality.Builder setIncomingSilenceDetectedAtCallSetup(boolean);
@@ -12437,7 +12437,7 @@ package android.telephony {
     method @NonNull public android.telephony.CallQuality.Builder setNumRtpPacketsReceived(int);
     method @NonNull public android.telephony.CallQuality.Builder setNumRtpPacketsTransmitted(int);
     method @NonNull public android.telephony.CallQuality.Builder setNumRtpPacketsTransmittedLost(int);
-    method @NonNull public android.telephony.CallQuality.Builder setNumRtpSidPacketsRx(int);
+    method @NonNull public android.telephony.CallQuality.Builder setNumRtpSidPacketsReceived(int);
     method @NonNull public android.telephony.CallQuality.Builder setNumVoiceFrames(int);
     method @NonNull public android.telephony.CallQuality.Builder setOutgoingSilenceDetectedAtCallSetup(boolean);
     method @NonNull public android.telephony.CallQuality.Builder setRtpInactivityDetected(boolean);
diff --git a/telephony/java/android/telephony/CallQuality.java b/telephony/java/android/telephony/CallQuality.java
index d77bf672347a..9b12ae52e5cf 100644
--- a/telephony/java/android/telephony/CallQuality.java
+++ b/telephony/java/android/telephony/CallQuality.java
@@ -86,7 +86,7 @@ public final class CallQuality implements Parcelable {
     private int mNumDroppedRtpPackets;
     private long mMinPlayoutDelayMillis;
     private long mMaxPlayoutDelayMillis;
-    private int mNumRtpSidPacketsRx;
+    private int mNumRtpSidPacketsReceived;
     private int mNumRtpDuplicatePackets;
 
     /** @hide **/
@@ -110,7 +110,7 @@ public final class CallQuality implements Parcelable {
         mNumDroppedRtpPackets = in.readInt();
         mMinPlayoutDelayMillis = in.readLong();
         mMaxPlayoutDelayMillis = in.readLong();
-        mNumRtpSidPacketsRx = in.readInt();
+        mNumRtpSidPacketsReceived = in.readInt();
         mNumRtpDuplicatePackets = in.readInt();
     }
 
@@ -352,8 +352,8 @@ public final class CallQuality implements Parcelable {
      * Returns the total number of RTP SID (Silence Insertion Descriptor) packets
      * received by this device for an ongoing call
      */
-    public int getNumRtpSidPacketsRx() {
-        return mNumRtpSidPacketsRx;
+    public int getNumRtpSidPacketsReceived() {
+        return mNumRtpSidPacketsReceived;
     }
 
     /**
@@ -417,7 +417,7 @@ public final class CallQuality implements Parcelable {
                 + " numDroppedRtpPackets=" + mNumDroppedRtpPackets
                 + " minPlayoutDelayMillis=" + mMinPlayoutDelayMillis
                 + " maxPlayoutDelayMillis=" + mMaxPlayoutDelayMillis
-                + " numRtpSidPacketsRx=" + mNumRtpSidPacketsRx
+                + " numRtpSidPacketsReceived=" + mNumRtpSidPacketsReceived
                 + " numRtpDuplicatePackets=" + mNumRtpDuplicatePackets
                 + "}";
     }
@@ -444,7 +444,7 @@ public final class CallQuality implements Parcelable {
                 mNumDroppedRtpPackets,
                 mMinPlayoutDelayMillis,
                 mMaxPlayoutDelayMillis,
-                mNumRtpSidPacketsRx,
+                mNumRtpSidPacketsReceived,
                 mNumRtpDuplicatePackets);
     }
 
@@ -479,7 +479,7 @@ public final class CallQuality implements Parcelable {
                 && mNumDroppedRtpPackets == s.mNumDroppedRtpPackets
                 && mMinPlayoutDelayMillis == s.mMinPlayoutDelayMillis
                 && mMaxPlayoutDelayMillis == s.mMaxPlayoutDelayMillis
-                && mNumRtpSidPacketsRx == s.mNumRtpSidPacketsRx
+                && mNumRtpSidPacketsReceived == s.mNumRtpSidPacketsReceived
                 && mNumRtpDuplicatePackets == s.mNumRtpDuplicatePackets);
     }
 
@@ -513,7 +513,7 @@ public final class CallQuality implements Parcelable {
         dest.writeInt(mNumDroppedRtpPackets);
         dest.writeLong(mMinPlayoutDelayMillis);
         dest.writeLong(mMaxPlayoutDelayMillis);
-        dest.writeInt(mNumRtpSidPacketsRx);
+        dest.writeInt(mNumRtpSidPacketsReceived);
         dest.writeInt(mNumRtpDuplicatePackets);
     }
 
@@ -562,7 +562,7 @@ public final class CallQuality implements Parcelable {
         private int mNumDroppedRtpPackets;
         private long mMinPlayoutDelayMillis;
         private long mMaxPlayoutDelayMillis;
-        private int mNumRtpSidPacketsRx;
+        private int mNumRtpSidPacketsReceived;
         private int mNumRtpDuplicatePackets;
 
         /**
@@ -595,8 +595,11 @@ public final class CallQuality implements Parcelable {
          * @param callDuration the call duration in milliseconds
          * @return The same instance of the builder.
          */
-        public @NonNull Builder setCallDuration(int callDuration) {
-            mCallDuration = callDuration;
+        // Newer builder includes guidelines compliant units; existing method does not.
+        @NonNull
+        @SuppressWarnings("MissingGetterMatchingBuilder")
+        public Builder setCallDurationMillis(int callDurationMillis) {
+            mCallDuration = callDurationMillis;
             return this;
         }
 
@@ -675,8 +678,11 @@ public final class CallQuality implements Parcelable {
          * @param averageRoundTripTime average round trip delay in milliseconds
          * @return The same instance of the builder.
          */
-        public @NonNull Builder setAverageRoundTripTime(int averageRoundTripTime) {
-            mAverageRoundTripTime = averageRoundTripTime;
+        // Newer builder includes guidelines compliant units; existing method does not.
+        @NonNull
+        @SuppressWarnings("MissingGetterMatchingBuilder")
+        public Builder setAverageRoundTripTimeMillis(int averageRoundTripTimeMillis) {
+            mAverageRoundTripTime = averageRoundTripTimeMillis;
             return this;
         }
 
@@ -789,12 +795,12 @@ public final class CallQuality implements Parcelable {
          * Set the total number of RTP SID (Silence Insertion Descriptor)
          * packets received by this device for an ongoing call.
          *
-         * @param numRtpSidPacketsRx the total number of RTP SID packets received
+         * @param numRtpSidPacketsReceived the total number of RTP SID packets received
          * by this device for an ongoing call.
          * @return The same instance of the builder.
          */
-        public @NonNull Builder setNumRtpSidPacketsRx(int numRtpSidPacketsRx) {
-            mNumRtpSidPacketsRx = numRtpSidPacketsRx;
+        public @NonNull Builder setNumRtpSidPacketsReceived(int numRtpSidPacketsReceived) {
+            mNumRtpSidPacketsReceived = numRtpSidPacketsReceived;
             return this;
         }
 
@@ -838,7 +844,7 @@ public final class CallQuality implements Parcelable {
             callQuality.mNumDroppedRtpPackets = mNumDroppedRtpPackets;
             callQuality.mMinPlayoutDelayMillis = mMinPlayoutDelayMillis;
             callQuality.mMaxPlayoutDelayMillis = mMaxPlayoutDelayMillis;
-            callQuality.mNumRtpSidPacketsRx = mNumRtpSidPacketsRx;
+            callQuality.mNumRtpSidPacketsReceived = mNumRtpSidPacketsReceived;
             callQuality.mNumRtpDuplicatePackets = mNumRtpDuplicatePackets;
 
             return callQuality;